From 36b5c6871cdffe6289cedc654f3024391cd860d6 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Fri, 1 Jan 2010 18:16:24 +0200
Subject: [PATCH] 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.
---
 wpa_supplicant/dbus/dbus_common.c      | 11 +++++++++++
 wpa_supplicant/dbus/dbus_new_helpers.h | 10 ----------
 wpa_supplicant/dbus/dbus_old.h         | 10 ----------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/wpa_supplicant/dbus/dbus_common.c b/wpa_supplicant/dbus/dbus_common.c
index 69277ab0a..66002a41c 100644
--- 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 0fc742ab9..13dbab22a 100644
--- 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 c5c951203..a346a2db9 100644
--- 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