diff options
| author | Wolfgang Beck <wolfgang.beck@nokia.com> | 2010-03-30 01:53:42 (GMT) |
|---|---|---|
| committer | Wolfgang Beck <wolfgang.beck@nokia.com> | 2010-03-30 01:53:42 (GMT) |
| commit | 0d7a0b1bf2ab50621ed662a3e178d2ad5add4114 (patch) | |
| tree | d9ec0dd6f3fd9abc213368f17f3bfdb2c2659610 /src/plugins | |
| parent | ffd4c014747f6842b9103d67204b5b54626bf876 (diff) | |
| download | Qt-0d7a0b1bf2ab50621ed662a3e178d2ad5add4114.zip Qt-0d7a0b1bf2ab50621ed662a3e178d2ad5add4114.tar.gz Qt-0d7a0b1bf2ab50621ed662a3e178d2ad5add4114.tar.bz2 | |
MONILITY-645
Merging bearer header.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/nativewifi/platformdefs.h | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/platformdefs_win.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/bearer/nativewifi/platformdefs.h b/src/plugins/bearer/nativewifi/platformdefs.h index 57ae852..d67525a 100644 --- a/src/plugins/bearer/nativewifi/platformdefs.h +++ b/src/plugins/bearer/nativewifi/platformdefs.h @@ -52,6 +52,8 @@ #define WLAN_AVAILABLE_NETWORK_HAS_PROFILE 2 #define DOT11_SSID_MAX_LENGTH 32 +QT_BEGIN_NAMESPACE + struct WLAN_NOTIFICATION_DATA { DWORD NotificationSource; DWORD NotificationCode; @@ -319,4 +321,6 @@ extern WlanScanProto local_WlanScan; extern WlanFreeMemoryProto local_WlanFreeMemory; extern WlanCloseHandleProto local_WlanCloseHandle; +QT_END_NAMESPACE + #endif // PLATFORMDEFS_H diff --git a/src/plugins/bearer/platformdefs_win.h b/src/plugins/bearer/platformdefs_win.h index 37d099c..1a10ba7 100644 --- a/src/plugins/bearer/platformdefs_win.h +++ b/src/plugins/bearer/platformdefs_win.h @@ -47,6 +47,8 @@ #undef interface #include <winioctl.h> +QT_BEGIN_NAMESPACE + #ifndef NS_NLA #define NS_NLA 15 @@ -131,4 +133,6 @@ enum NDIS_PHYSICAL_MEDIUM { #define IOCTL_NDIS_QUERY_GLOBAL_STATS \ CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, 0, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) +QT_END_NAMESPACE + #endif |