dbus: Do not include libdbus dbus/dbus.h into dbus_{old,new}.h

These header files are included outside the dbus subdirectory and there
is not really any need to force the libdbus dbus/dbus.h header file to
be included into these files.

diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
index 01de05599cd05b8b2d83a39ee508fb105622e94d..51a46e8893d7486de5a67ba1905ef9d03c861a5b 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new.h
+++ b/wpa_supplicant/dbus/dbus_new.h
@@ -83,8 +83,6 @@ struct wpas_dbus_callbacks {
 
 #ifdef CONFIG_CTRL_IFACE_DBUS_NEW
 
-#include <dbus/dbus.h>
-
 #define WPAS_DBUS_OBJECT_PATH_MAX 150
 
 #define WPAS_DBUS_NEW_SERVICE          "fi.w1.wpa_supplicant1"

diff --git a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c
index aa0494b79ac54fe36f6b4bbb5b20f300ecf9c7ba..2cf7ec64da23b0d11401426a201b4195c5577e2a 100644 (file)
--- a/wpa_supplicant/dbus/dbus_old.c
+++ b/wpa_supplicant/dbus/dbus_old.c
@@ -13,6 +13,7 @@
  */
 
 #include "includes.h"
+#include <dbus/dbus.h>
 
 #include "common.h"
 #include "eloop.h"

diff --git a/wpa_supplicant/dbus/dbus_old.h b/wpa_supplicant/dbus/dbus_old.h
index a346a2db9d16f1057ff8fcd149b562d8228a82ad..5aef01d02d1b4b99d458e51d2ba1fd61e0b595c4 100644 (file)
--- a/wpa_supplicant/dbus/dbus_old.h
+++ b/wpa_supplicant/dbus/dbus_old.h
@@ -19,8 +19,6 @@ struct wps_credential;
 
 #ifdef CONFIG_CTRL_IFACE_DBUS
 
-#include <dbus/dbus.h>
-
 #define WPAS_DBUS_OBJECT_PATH_MAX 150
 
 #define WPAS_DBUS_SERVICE      "fi.epitest.hostap.WPASupplicant"
@@ -99,9 +97,6 @@ const char *wpa_supplicant_get_dbus_path(struct wpa_supplicant *wpa_s);
 struct wpa_supplicant * wpa_supplicant_get_iface_by_dbus_path(
        struct wpa_global *global, const char *path);
 
-DBusMessage * wpas_dbus_new_invalid_iface_error(DBusMessage *message);
-DBusMessage * wpas_dbus_new_invalid_network_error(DBusMessage *message);
-
 #else /* CONFIG_CTRL_IFACE_DBUS */
 
 static inline void

diff --git a/wpa_supplicant/dbus/dbus_old_handlers.c b/wpa_supplicant/dbus/dbus_old_handlers.c
index e848f25cd7075ce15c7dc873a9c462ba62187f12..5f48e42dcc7aedbea6487d3b6f3505ccf2c4ff5b 100644 (file)
--- a/wpa_supplicant/dbus/dbus_old_handlers.c
+++ b/wpa_supplicant/dbus/dbus_old_handlers.c
@@ -13,6 +13,7 @@
  */
 
 #include "includes.h"
+#include <dbus/dbus.h>
 
 #include "common.h"
 #include "eap_peer/eap_methods.h"

diff --git a/wpa_supplicant/dbus/dbus_old_handlers.h b/wpa_supplicant/dbus/dbus_old_handlers.h
index 8af3fec0e99ae9732ae242d725ad767877b1df2b..4de89540322de2b8a0e3a9009769815e25f6aab9 100644 (file)
--- a/wpa_supplicant/dbus/dbus_old_handlers.h
+++ b/wpa_supplicant/dbus/dbus_old_handlers.h
@@ -16,6 +16,7 @@
 #define CTRL_IFACE_DBUS_HANDLERS_H
 
 DBusMessage * wpas_dbus_new_invalid_iface_error(DBusMessage *message);
+DBusMessage * wpas_dbus_new_invalid_network_error(DBusMessage *message);
 
 DBusMessage * wpas_dbus_global_add_interface(DBusMessage *message,
                                             struct wpa_global *global);

diff --git a/wpa_supplicant/dbus/dbus_old_handlers_wps.c b/wpa_supplicant/dbus/dbus_old_handlers_wps.c
index 79dfdab20abce238280f4c47b560901295cc7f8a..b5879f3ae8fba0602f3c7446172790d8fc2c30c4 100644 (file)
--- a/wpa_supplicant/dbus/dbus_old_handlers_wps.c
+++ b/wpa_supplicant/dbus/dbus_old_handlers_wps.c
@@ -13,6 +13,7 @@
  */
 
 #include "includes.h"
+#include <dbus/dbus.h>
 
 #include "common.h"
 #include "../config.h"