mingw-wsl-patches

Fork

# HG changeset patch
# Parent 56660feb0d3ab087541cea538525f7b0e0d0441c
Make <dsrole.h> header effectively self-contained.

diff --git a/wslapi/include/dsrole.h b/wslapi/include/dsrole.h
--- a/wslapi/include/dsrole.h
+++ b/wslapi/include/dsrole.h
@@ -1,30 +1,46 @@
 /*
- * dsrole.h - Active Directory
+ * dsrole.h
  *
- * THIS SOFTWARE IS NOT COPYRIGHTED
+ * Active Directory API declarations for workstation, server, and domain
+ * controller network role queries.
  *
- * This source code is offered for use in the public domain.  You may use,
- * modify or distribute it freely.
+ * $Id$
  *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED.  This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * Written by Dimitri Papadopoulos <papadopo@users.sourceforge.net>
+ * Copyright (C) 2006, 2017, MinGW.org Project
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  */
 #ifndef _DSROLE_H
 #define _DSROLE_H
-#if __GNUC__ >= 3
 #pragma GCC system_header
-#endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <windef.h>
 
-#if (_WIN32_WINNT >= 0x0500)
+_BEGIN_C_DECLS
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
 /*--- Active Directory Reference - Active Directory Enumerations */
 typedef enum {
 	DsRole_RoleStandaloneWorkstation,
 	DsRole_RoleMemberWorkstation,
 	DsRole_RoleStandaloneServer,
@@ -65,11 +81,10 @@ typedef struct _DSROLE_PRIMARY_DOMAIN_IN
 #define DSROLE_PRIMARY_DOMAIN_GUID_PRESENT 0x01000000
 typedef struct _DSROLE_UPGRADE_STATUS_INFO {
 	ULONG OperationState;
 	DSROLE_SERVER_STATE PreviousServerState;
 } DSROLE_UPGRADE_STATUS_INFO,*PDSROLE_UPGRADE_STATUS_INFO;
-#endif /* (_WIN32_WINNT >= 0x0500) */
+#endif	/* _WIN32_WINNT >= _WIN32_WINNT_WIN2K */
 
-#ifdef __cplusplus
-}
-#endif
-#endif
+_END_C_DECLS
+
+#endif	/* !_DSROLE_H: $RCSfile$: end of file */