# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813783 -3600
# Node ID 1ff9bf2737cf5ed057e698e17379a69ed4b6690b
# Parent  d1f0fe5eccbece3361ec8a16e9412de4ab4ef514# Parent  1c425781161e61be2f782a7e0485c3dd2a3b9fcd
Catchup to latest Symbian^4

diff -r 1c425781161e -r 1ff9bf2737cf wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlandevicesettings.mmp
--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlandevicesettings.mmp	Tue Jul 06 16:24:00 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlandevicesettings.mmp	Thu Jul 22 16:49:43 2010 +0100
@@ -28,7 +28,7 @@
 SOURCEPATH      ../src
 SOURCE          wlandevicesettings.cpp
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE         ../eabi/ 
 #else
 DEFFILE         ../bwinscw/ 
diff -r 1c425781161e -r 1ff9bf2737cf wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlmplatform.mmp
--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlmplatform.mmp	Tue Jul 06 16:24:00 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlmplatform.mmp	Thu Jul 22 16:49:43 2010 +0100
@@ -24,7 +24,7 @@
 CAPABILITY      CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE         ../eabi/ 
 #else
 DEFFILE         ../bwinscw/ 
diff -r 1c425781161e -r 1ff9bf2737cf wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlmserver.mmp
--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlmserver.mmp	Tue Jul 06 16:24:00 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlmserver.mmp	Thu Jul 22 16:49:43 2010 +0100
@@ -24,7 +24,7 @@
 CAPABILITY      CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE         ../eabi/ 
 #else
 DEFFILE         ../bwinscw/ 
diff -r 1c425781161e -r 1ff9bf2737cf wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlmserversrv.mmh
--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlmserversrv.mmh	Tue Jul 06 16:24:00 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group/wlmserversrv.mmh	Thu Jul 22 16:49:43 2010 +0100
@@ -24,7 +24,7 @@
 CAPABILITY      CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE         ../eabi/wlmserversrv.def
 #else
 DEFFILE         ../bwinscw/wlmserversrv.def
diff -r 1c425781161e -r 1ff9bf2737cf wlan_bearer/wlanldd/wlan_common/umac_common/inc/UmacDot11State.h
--- a/wlan_bearer/wlanldd/wlan_common/umac_common/inc/UmacDot11State.h	Tue Jul 06 16:24:00 2010 +0300
+++ b/wlan_bearer/wlanldd/wlan_common/umac_common/inc/UmacDot11State.h	Thu Jul 22 16:49:43 2010 +0100
@@ -267,7 +267,7 @@
 
 protected:
 
-    static const TUint32 KCompleteManagementRequest = 0xACDCACDC;
+    enum { KCompleteManagementRequest = 0xACDCACDC };
 
     /**
     * C++ default constructor.