Renamed local DBUS_VERSION define to avoid conflict with dbus 1.1 headers

This commit is contained in:
Jouni Malinen 2008-03-05 16:05:26 +02:00
parent 13b3f33942
commit c673c5fc0f

View file

@ -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