From: Jouni Malinen <j@w1.fi>
Date: Wed, 5 Mar 2008 14:05:26 +0000 (+0200)
Subject: Renamed local DBUS_VERSION define to avoid conflict with dbus 1.1 headers
X-Git-Tag: hostap_0_6_4~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c673c5fc0ff51e8ff216c633a713fb49608887e0;p=thirdparty%2Fhostap.git

Renamed local DBUS_VERSION define to avoid conflict with dbus 1.1 headers
---

diff --git a/wpa_supplicant/ctrl_iface_dbus.c b/wpa_supplicant/ctrl_iface_dbus.c
index 9bfd04771..5713c71f0 100644
--- 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