From 3acb50056cf3e9e3f4a9776d5f2cbdf75fe0ae8c Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 29 Nov 2009 18:28:08 +0200 Subject: [PATCH] Remove src/rsn_supp from default header path --- wpa_supplicant/Makefile | 1 - wpa_supplicant/config.c | 2 +- wpa_supplicant/ctrl_iface.c | 6 +++--- wpa_supplicant/ctrl_iface_dbus_handlers.c | 2 +- wpa_supplicant/eapol_test.c | 2 +- wpa_supplicant/events.c | 6 +++--- wpa_supplicant/ibss_rsn.c | 4 ++-- wpa_supplicant/mlme.c | 2 +- wpa_supplicant/nmake.mak | 2 +- wpa_supplicant/preauth_test.c | 6 +++--- wpa_supplicant/sme.c | 4 ++-- wpa_supplicant/symbian/wpa_supplicant.mmp | 2 +- wpa_supplicant/tests/test_wpa.c | 4 ++-- wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj | 4 ++-- wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj | 4 ++-- wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj | 4 ++-- wpa_supplicant/wpa_supplicant.c | 6 +++--- wpa_supplicant/wpas_glue.c | 4 ++-- wpa_supplicant/wps_supplicant.c | 2 +- .../xcode/wpa_supplicant.xcodeproj/project.pbxproj | 2 -- 20 files changed, 33 insertions(+), 36 deletions(-) diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index c91758b96..656f69e4a 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -12,7 +12,6 @@ export BINDIR ?= /usr/local/sbin/ CFLAGS += -I../src CFLAGS += -I../src/crypto CFLAGS += -I../src/utils -CFLAGS += -I../src/rsn_supp ALL=wpa_supplicant wpa_passphrase wpa_cli diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c index 128fe717d..473461477 100644 --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -15,7 +15,7 @@ #include "includes.h" #include "common.h" -#include "wpa.h" +#include "rsn_supp/wpa.h" #include "sha1.h" #include "eap_peer/eap.h" #include "config.h" diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 0855db81b..8ceebd321 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -16,15 +16,15 @@ #include "common.h" #include "eloop.h" -#include "wpa.h" +#include "rsn_supp/wpa.h" #include "config.h" #include "eapol_supp/eapol_supp_sm.h" #include "wpa_supplicant_i.h" #include "driver_i.h" #include "ctrl_iface.h" #include "l2_packet/l2_packet.h" -#include "preauth.h" -#include "pmksa_cache.h" +#include "rsn_supp/preauth.h" +#include "rsn_supp/pmksa_cache.h" #include "common/wpa_ctrl.h" #include "eap_peer/eap.h" #include "common/ieee802_11_defs.h" diff --git a/wpa_supplicant/ctrl_iface_dbus_handlers.c b/wpa_supplicant/ctrl_iface_dbus_handlers.c index 55b1acb91..d685697a0 100644 --- a/wpa_supplicant/ctrl_iface_dbus_handlers.c +++ b/wpa_supplicant/ctrl_iface_dbus_handlers.c @@ -27,7 +27,7 @@ #include "wpas_glue.h" #include "eapol_supp/eapol_supp_sm.h" #include "wps_supplicant.h" -#include "wpa.h" +#include "rsn_supp/wpa.h" extern int wpa_debug_level; extern int wpa_debug_show_keys; diff --git a/wpa_supplicant/eapol_test.c b/wpa_supplicant/eapol_test.c index 1b5ae681f..0d493237c 100644 --- a/wpa_supplicant/eapol_test.c +++ b/wpa_supplicant/eapol_test.c @@ -23,7 +23,7 @@ #include "eapol_supp/eapol_supp_sm.h" #include "eap_peer/eap.h" #include "eloop.h" -#include "wpa.h" +#include "rsn_supp/wpa.h" #include "eap_peer/eap_i.h" #include "wpa_supplicant_i.h" #include "radius/radius.h" diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index d5223c52c..9548cf58b 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -16,15 +16,15 @@ #include "common.h" #include "eapol_supp/eapol_supp_sm.h" -#include "wpa.h" +#include "rsn_supp/wpa.h" #include "eloop.h" #include "config.h" #include "l2_packet/l2_packet.h" #include "wpa_supplicant_i.h" #include "driver_i.h" #include "pcsc_funcs.h" -#include "preauth.h" -#include "pmksa_cache.h" +#include "rsn_supp/preauth.h" +#include "rsn_supp/pmksa_cache.h" #include "common/wpa_ctrl.h" #include "eap_peer/eap.h" #include "notify.h" diff --git a/wpa_supplicant/ibss_rsn.c b/wpa_supplicant/ibss_rsn.c index b15668441..79878b547 100644 --- a/wpa_supplicant/ibss_rsn.c +++ b/wpa_supplicant/ibss_rsn.c @@ -17,8 +17,8 @@ #include "common.h" #include "l2_packet/l2_packet.h" #include "wpa_supplicant_i.h" -#include "wpa.h" -#include "wpa_ie.h" +#include "rsn_supp/wpa.h" +#include "rsn_supp/wpa_ie.h" #include "../hostapd/wpa.h" #include "ibss_rsn.h" diff --git a/wpa_supplicant/mlme.c b/wpa_supplicant/mlme.c index a71df15ee..898a707a8 100644 --- a/wpa_supplicant/mlme.c +++ b/wpa_supplicant/mlme.c @@ -22,7 +22,7 @@ #include "wpa_supplicant_i.h" #include "notify.h" #include "driver_i.h" -#include "wpa.h" +#include "rsn_supp/wpa.h" #include "common/ieee802_11_defs.h" #include "common/ieee802_11_common.h" #include "mlme.h" diff --git a/wpa_supplicant/nmake.mak b/wpa_supplicant/nmake.mak index 8b9956f0e..34da9782f 100644 --- a/wpa_supplicant/nmake.mak +++ b/wpa_supplicant/nmake.mak @@ -49,7 +49,7 @@ CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE_NAMED_PIPE CFLAGS = $(CFLAGS) /DCONFIG_DRIVER_NDIS CFLAGS = $(CFLAGS) /I..\src /I..\src\utils /I..\src\crypto -CFLAGS = $(CFLAGS) /I..\src\rsn_supp /I..\src\eapol_supp /I. +CFLAGS = $(CFLAGS) /I. CFLAGS = $(CFLAGS) /DWIN32 CFLAGS = $(CFLAGS) /Fo$(OBJDIR)\\ /c CFLAGS = $(CFLAGS) /W3 diff --git a/wpa_supplicant/preauth_test.c b/wpa_supplicant/preauth_test.c index 3082191db..b7916fbcd 100644 --- a/wpa_supplicant/preauth_test.c +++ b/wpa_supplicant/preauth_test.c @@ -22,14 +22,14 @@ #include "config.h" #include "eapol_supp/eapol_supp_sm.h" #include "eloop.h" -#include "wpa.h" +#include "rsn_supp/wpa.h" #include "eap_peer/eap.h" #include "wpa_supplicant_i.h" #include "l2_packet/l2_packet.h" #include "ctrl_iface.h" #include "pcsc_funcs.h" -#include "preauth.h" -#include "pmksa_cache.h" +#include "rsn_supp/preauth.h" +#include "rsn_supp/pmksa_cache.h" #include "drivers/driver.h" diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c index b4fe000d0..734b2e980 100644 --- a/wpa_supplicant/sme.c +++ b/wpa_supplicant/sme.c @@ -18,8 +18,8 @@ #include "common/ieee802_11_defs.h" #include "eapol_supp/eapol_supp_sm.h" #include "common/wpa_common.h" -#include "wpa.h" -#include "pmksa_cache.h" +#include "rsn_supp/wpa.h" +#include "rsn_supp/pmksa_cache.h" #include "config.h" #include "wpa_supplicant_i.h" #include "driver_i.h" diff --git a/wpa_supplicant/symbian/wpa_supplicant.mmp b/wpa_supplicant/symbian/wpa_supplicant.mmp index e16e08383..52e741162 100644 --- a/wpa_supplicant/symbian/wpa_supplicant.mmp +++ b/wpa_supplicant/symbian/wpa_supplicant.mmp @@ -5,7 +5,7 @@ TARGETTYPE exe SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\ecom \epoc32\include\libc -USERINCLUDE .. ..\..\src ..\..\src\utils ..\..\src\crypto ..\..\src\rsn_supp +USERINCLUDE .. ..\..\src ..\..\src\utils ..\..\src\crypto SOURCEPATH .. SOURCE main_symbian.cpp diff --git a/wpa_supplicant/tests/test_wpa.c b/wpa_supplicant/tests/test_wpa.c index af1aa0222..77fc36a14 100644 --- a/wpa_supplicant/tests/test_wpa.c +++ b/wpa_supplicant/tests/test_wpa.c @@ -18,8 +18,8 @@ #include "eloop.h" #include "common/ieee802_11_defs.h" #include "../config.h" -#include "wpa.h" -#include "wpa_ie.h" +#include "rsn_supp/wpa.h" +#include "rsn_supp/wpa_ie.h" #include "../hostapd/wpa.h" diff --git a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj index 28cfa3db7..8ef522bdf 100755 --- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj +++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj @@ -40,7 +40,7 @@