diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2009-08-22 08:57:34 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2009-08-22 08:57:34 +0000 |
| commit | eb4c6ace23a7feb9f3bea2897caddf3636b67f24 (patch) | |
| tree | ad21bd78bb811a8a07df195051c27a8465b2094b /src/dbusbind.c | |
| parent | 244f96fcc4d510eca9f12f2459b715de5d1fa6cd (diff) | |
| download | emacs-eb4c6ace23a7feb9f3bea2897caddf3636b67f24.tar.gz emacs-eb4c6ace23a7feb9f3bea2897caddf3636b67f24.tar.bz2 emacs-eb4c6ace23a7feb9f3bea2897caddf3636b67f24.zip | |
* dbusbind.c (XD_WITH_DBUS_WATCH_GET_UNIX_FD): Remove. It was
intended as hotfix only.
(xd_add_watch, xd_remove_watch): Use HAVE_DBUS_WATCH_GET_UNIX_FD.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 38912e5f51b..9542cd2401d 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -71,16 +71,6 @@ int xd_in_read_queued_messages = 0; /* We use "xd_" and "XD_" as prefix for all internal symbols, because we don't want to poison other namespaces with "dbus_". */ -/* Since D-Bus 1.1.1, dbus_watch_get_fd() was replaced by - dbus_watch_get_unix_fd and dbus_watch_get_socket. We must check - this. */ -#ifdef DBUS_VERSION -#define XD_WITH_DBUS_WATCH_GET_UNIX_FD \ - ((1 << 16) | (1 << 8) | (1)) <= DBUS_VERSION -#else -#define XD_WITH_DBUS_WATCH_GET_UNIX_FD 0 -#endif - /* Raise a signal. If we are reading events, we cannot signal; we throw to xd_read_queued_messages then. */ #define XD_SIGNAL1(arg) \ @@ -752,7 +742,7 @@ xd_add_watch (watch, data) /* We check only for incoming data. */ if (dbus_watch_get_flags (watch) & DBUS_WATCH_READABLE) { -#if XD_WITH_DBUS_WATCH_GET_UNIX_FD +#if HAVE_DBUS_WATCH_GET_UNIX_FD /* TODO: Reverse these on Win32, which prefers the opposite. */ int fd = dbus_watch_get_unix_fd(watch); if (fd == -1) @@ -782,7 +772,7 @@ xd_remove_watch (watch, data) /* We check only for incoming data. */ if (dbus_watch_get_flags (watch) & DBUS_WATCH_READABLE) { -#if XD_WITH_DBUS_WATCH_GET_UNIX_FD +#if HAVE_DBUS_WATCH_GET_UNIX_FD /* TODO: Reverse these on Win32, which prefers the opposite. */ int fd = dbus_watch_get_unix_fd(watch); if (fd == -1) |