dbus: Move the SIGPOLL FreeBSD compat code into dbus_common.c

No point in storing this in header files anymore since SIGPOLL is only
used in dbus_common.c.

diff --git a/wpa_supplicant/dbus/dbus_common.c b/wpa_supplicant/dbus/dbus_common.c
index 69277ab0ad21aa323cf4a7d407c51ed3d303235a..66002a41c3e37534b5b3b6739f10ce2ada935b3f 100644 (file)
--- a/wpa_supplicant/dbus/dbus_common.c
+++ b/wpa_supplicant/dbus/dbus_common.c
@@ -25,6 +25,17 @@
 #include "dbus_old.h"
 
 
+#ifndef SIGPOLL
+#ifdef SIGIO
+/*
+ * If we do not have SIGPOLL, try to use SIGIO instead. This is needed for
+ * FreeBSD.
+ */
+#define SIGPOLL SIGIO
+#endif
+#endif
+
+
 /**
  * dispatch_initial_dbus_messages - Dispatch initial dbus messages after
  *     claiming bus name

diff --git a/wpa_supplicant/dbus/dbus_new_helpers.h b/wpa_supplicant/dbus/dbus_new_helpers.h
index 0fc742ab9b06298eb9b77b3246992187984b160d..13dbab22aa474fc334cdc13d8403604808417332 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_helpers.h
+++ b/wpa_supplicant/dbus/dbus_new_helpers.h
@@ -115,16 +115,6 @@ struct wpa_dbus_property_desc {
 };
 
 
-#ifndef SIGPOLL
-#ifdef SIGIO
-/*
- * If we do not have SIGPOLL, try to use SIGIO instead. This is needed for
- * FreeBSD.
- */
-#define SIGPOLL SIGIO
-#endif
-#endif
-
 #define WPAS_DBUS_OBJECT_PATH_MAX 150
 #define WPAS_DBUS_INTERFACE_MAX 150
 #define WPAS_DBUS_METHOD_SIGNAL_PROP_MAX 50

diff --git a/wpa_supplicant/dbus/dbus_old.h b/wpa_supplicant/dbus/dbus_old.h
index c5c9512031eacee1cd93e20735595d8149597b4d..a346a2db9d16f1057ff8fcd149b562d8228a82ad 100644 (file)
--- a/wpa_supplicant/dbus/dbus_old.h
+++ b/wpa_supplicant/dbus/dbus_old.h
@@ -19,16 +19,6 @@ struct wps_credential;
 
 #ifdef CONFIG_CTRL_IFACE_DBUS
 
-#ifndef SIGPOLL
-#ifdef SIGIO
-/*
- * If we do not have SIGPOLL, try to use SIGIO instead. This is needed for
- * FreeBSD.
- */
-#define SIGPOLL SIGIO
-#endif
-#endif
-
 #include <dbus/dbus.h>
 
 #define WPAS_DBUS_OBJECT_PATH_MAX 150