mingw-wsl-patches

Fork

# HG changeset patch
# Parent 2f139b91a0d423c86599d01d8da920f6a3923745
Make <secext.h> header effectively self-contained.

diff --git a/wslapi/include/secext.h b/wslapi/include/secext.h
--- a/wslapi/include/secext.h
+++ b/wslapi/include/secext.h
@@ -1,21 +1,18 @@
 #ifndef _SECEXT_H
 #define _SECEXT_H
+#pragma GCC system_header
 
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <windef.h>
 
 #ifndef RC_INVOKED
-#if (_WIN32_WINNT >= 0x0500)
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
+
+_BEGIN_C_DECLS
+
 typedef enum
-{
-  NameUnknown = 0,
+{ NameUnknown = 0,
   NameFullyQualifiedDN = 1,
   NameSamCompatible = 2,
   NameDisplay = 3,
   NameUniqueId = 6,
   NameCanonical = 7,
@@ -23,30 +20,22 @@ typedef enum
   NameCanonicalEx = 9,
   NameServicePrincipal = 10,
   NameDnsDomain = 12
 } EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;
 
+#define GetComputerObjectName __AW_SUFFIXED__(GetComputerObjectName)
 BOOLEAN WINAPI GetComputerObjectNameA(EXTENDED_NAME_FORMAT,LPSTR,PULONG);
 BOOLEAN WINAPI GetComputerObjectNameW(EXTENDED_NAME_FORMAT,LPWSTR,PULONG);
+
+#define GetUserNameEx __AW_SUFFIXED__(GetUserNameEx)
 BOOLEAN WINAPI GetUserNameExA(EXTENDED_NAME_FORMAT,LPSTR,PULONG);
 BOOLEAN WINAPI GetUserNameExW(EXTENDED_NAME_FORMAT,LPWSTR,PULONG);
+
+#define TranslateName __AW_SUFFIXED__(TranslateName)
 BOOLEAN WINAPI TranslateNameA(LPCSTR,EXTENDED_NAME_FORMAT,EXTENDED_NAME_FORMAT,LPSTR,PULONG);
 BOOLEAN WINAPI TranslateNameW(LPCWSTR,EXTENDED_NAME_FORMAT,EXTENDED_NAME_FORMAT,LPWSTR,PULONG);
 
-#ifdef UNICODE
-#define GetComputerObjectName GetComputerObjectNameW
-#define GetUserNameEx GetUserNameExW
-#define TranslateName TranslateNameW
-#else
-#define GetComputerObjectName GetComputerObjectNameA
-#define GetUserNameEx GetUserNameExA
-#define TranslateName TranslateNameA
-#endif
+_END_C_DECLS
 
-#endif /* ! RC_INVOKED */
-#endif /* _WIN32_WINNT >= 0x0500 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! _SECEXT_H */
+#endif	/* _WIN32_WINNT >= _WIN32_WINNT_WIN2K */
+#endif	/* ! RC_INVOKED */
+#endif	/* !_SECEXT_H */