Renamed local DBUS_VERSION define to avoid conflict with dbus 1.1 headers

16 years ago · c673c5fc0f
parent 13b3f33942
commit c673c5fc0f
1 changed files with 2 additions and 2 deletions
--- a/wpa_supplicant/ctrl_iface_dbus.c
+++ b/wpa_supplicant/ctrl_iface_dbus.c
@ -21,10 +21,10 @@
 #include "ctrl_iface_dbus.h"
 #include "ctrl_iface_dbus_handlers.h"

-#define DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR)
+#define _DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR)
 #define DBUS_VER(major, minor) ((major) << 8 | (minor))

-#if DBUS_VERSION < DBUS_VER(1,1)
+#if _DBUS_VERSION < DBUS_VER(1,1)
 #define dbus_watch_get_unix_fd dbus_watch_get_fd
 #endif