Alex Henrie : include: Move DOT11_PHY_TYPE to windot11.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 946c128bc2ab035d2d61f7683b7361e6ac864218
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=946c128bc2ab035d2d61f7683...

Author: Alex Henrie 
Date:   Wed Aug  4 23:56:50 2021 -0600

include: Move DOT11_PHY_TYPE to windot11.h.

Signed-off-by: Alex Henrie 
Signed-off-by: Alexandre Julliard

---

include/Makefile.in |  1 +
 include/windot11.h  | 38 ++++++++++++++++++++++++++++++++++++++
 include/wlanapi.h   | 18 ++----------------
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/include/Makefile.in b/include/Makefile.in
index 9b397ffa183..3dbfe6561f2 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -759,6 +759,7 @@ SOURCES = \
    wincrypt.h \
    windef.h \
    windns.h \
+	windot11.h \
    windows.foundation.collections.idl \
    windows.foundation.idl \
    windows.gaming.input.forcefeedback.idl \
diff --git a/include/windot11.h b/include/windot11.h
new file mode 100644
index 00000000000..e14ed738213
--- /dev/null
+++ b/include/windot11.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 Alex Henrie
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef _WINDOT11_H
+#define _WINDOT11_H
+
+typedef enum _DOT11_PHY_TYPE
+{
+    dot11_phy_type_unknown = 0x00,
+    dot11_phy_type_any = 0x00,
+    dot11_phy_type_fhss = 0x01,
+    dot11_phy_type_dsss = 0x02,
+    dot11_phy_type_irbaseband = 0x03,
+    dot11_phy_type_ofdm = 0x04,
+    dot11_phy_type_hrdsss = 0x05,
+    dot11_phy_type_erp = 0x06,
+    dot11_phy_type_ht = 0x07,
+    dot11_phy_type_vht = 0x08,
+    dot11_phy_type_IHV_start = 0x80000000,
+    dot11_phy_type_IHV_end = 0xFFFFFFFF
+} DOT11_PHY_TYPE, *PDOT11_PHY_TYPE;
+
+#endif /* _WINDOT11_H */
diff --git a/include/wlanapi.h b/include/wlanapi.h
index 80de128a60f..02b787e09a1 100644
--- a/include/wlanapi.h
+++ b/include/wlanapi.h
@@ -19,6 +19,8 @@
 #ifndef _WLAN_WLANAPI_H
 #define _WLAN_WLANAPI_H

+#include <windot11.h>
+
 typedef enum _WLAN_INTERFACE_STATE
 {
     wlan_interface_state_not_ready,
@@ -105,22 +107,6 @@ typedef enum _DOT11_CIPHER_ALGORITHM
     DOT11_CIPHER_ALGO_IHV_END = 0xFFFFFFFF
 } DOT11_CIPHER_ALGORITHM, *PDOT11_CIPHER_ALGORITHM;

-typedef enum _DOT11_PHY_TYPE
-{
-    dot11_phy_type_unknown = 0x00,
-    dot11_phy_type_any = 0x00,
-    dot11_phy_type_fhss = 0x01,
-    dot11_phy_type_dsss = 0x02,
-    dot11_phy_type_irbaseband = 0x03,
-    dot11_phy_type_ofdm = 0x04,
-    dot11_phy_type_hrdsss = 0x05,
-    dot11_phy_type_erp = 0x06,
-    dot11_phy_type_ht = 0x07,
-    dot11_phy_type_vht = 0x08,
-    dot11_phy_type_IHV_start = 0x80000000,
-    dot11_phy_type_IHV_end = 0xFFFFFFFF
-} DOT11_PHY_TYPE, *PDOT11_PHY_TYPE;
-
 #define WLAN_MAX_PHY_TYPE_NUMBER 8

typedef struct _WLAN_AVAILABLE_NETWORK