projects
/
libeap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13b3f33
)
Renamed local DBUS_VERSION define to avoid conflict with dbus 1.1 headers
author
Jouni Malinen
<j@w1.fi>
Wed, 5 Mar 2008 14:05:26 +0000
(16:05 +0200)
committer
Jouni Malinen
<j@w1.fi>
Wed, 5 Mar 2008 14:05:26 +0000
(16:05 +0200)
wpa_supplicant/ctrl_iface_dbus.c
patch
|
blob
|
history
diff --git
a/wpa_supplicant/ctrl_iface_dbus.c
b/wpa_supplicant/ctrl_iface_dbus.c
index
9bfd047
..
5713c71
100644
(file)
--- 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