Remove src/rsn_supp from default header path

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index c91758b..656f69e 100644 (file)
--- 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 128fe71..4734614 100644 (file)
--- 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 0855db8..8ceebd3 100644 (file)
--- 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 55b1acb..d685697 100644 (file)
--- 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 1b5ae68..0d49323 100644 (file)
--- 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 d5223c5..9548cf5 100644 (file)
--- 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 b156684..79878b5 100644 (file)
--- 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 a71df15..898a707 100644 (file)
--- 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 8b9956f..34da978 100644 (file)
--- 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 3082191..b7916fb 100644 (file)
--- 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 b4fe000..734b2e9 100644 (file)
--- 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 e16e083..52e7411 100644 (file)
--- 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 af1aa02..77fc36a 100644 (file)
--- 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 28cfa3d..8ef522b 100755 (executable)
--- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
+++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
index 2791825..41a7c67 100755 (executable)
--- a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
+++ b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
index a10b66d..947cd9d 100755 (executable)
--- a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
+++ b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index b73010a..d58e55b 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -22,7 +22,7 @@
 #include "eapol_supp/eapol_supp_sm.h"
 #include "eap_peer/eap.h"
 #include "eap_server/eap_methods.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "eloop.h"
 #include "config.h"
 #include "l2_packet/l2_packet.h"
@@ -31,8 +31,8 @@
 #include "ctrl_iface.h"
 #include "pcsc_funcs.h"
 #include "common/version.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 "mlme.h"
 #include "common/ieee802_11_defs.h"

diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c
index a59c0f1..f72bf3c 100644 (file)
--- a/wpa_supplicant/wpas_glue.c
+++ b/wpa_supplicant/wpas_glue.c
@@ -16,14 +16,14 @@
 
 #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 "common/wpa_common.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
-#include "pmksa_cache.h"
+#include "rsn_supp/pmksa_cache.h"
 #include "mlme.h"
 #include "sme.h"
 #include "common/ieee802_11_defs.h"

diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index de0a370..2833e21 100644 (file)
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -28,7 +28,7 @@
 #include "notify.h"
 #include "eap_common/eap_wsc_common.h"
 #include "blacklist.h"
-#include "wpa.h"
+#include "rsn_supp/wpa.h"
 #include "wps_supplicant.h"
 #include "dh_group5.h"
 

diff --git a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
index 1d94554..8029fff 100644 (file)
--- a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
+++ b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
@@ -455,7 +455,6 @@
                                        ../../src,
                                        ../../src/crypto,
                                        ../../src/utils,
-                                       ../../src/rsn_supp,
                                );
                                ONLY_ACTIVE_ARCH = YES;
                                OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";
@@ -478,7 +477,6 @@
                                        ../../src,
                                        ../../src/crypto,
                                        ../../src/utils,
-                                       ../../src/rsn_supp,
                                );
                                OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";
                                PREBINDING = NO;