* include/secext.h: New file. Declare EXTENDED_NAME_FORMAT.

	* include/security.h: Include secext.h.
	* include/winbase.h: Declare COMPUTER_NAME_FORMAT.
	Thanks to Dimitri Papadopoulos <dimitri_at@users.sf.net>

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index d006c9f..909daf0 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -4,6 +4,10 @@
        (Ke386QueryToAccessMap): Ditto.
        (Ke386SetIoAccessMap): Ditto.
        Thanks to Marcel Telka <telka@users.sf.net>
+       * include/secext.h: New file. Declare EXTENDED_NAME_FORMAT.
+       * include/security.h: Include secext.h.
+       * include/winbase.h: Declare COMPUTER_NAME_FORMAT.
+       Thanks to Dimitri Papadopoulos <dimitri_at@users.sf.net>
 
 2003-02-05  Earnie Boyd  <earnie@users.sf.net>
 

diff --git a/winsup/w32api/include/GL/gl.h b/winsup/w32api/include/GL/gl.h
index 2b1cadc..b2db7f5 100644 (file)
--- a/winsup/w32api/include/GL/gl.h
+++ b/winsup/w32api/include/GL/gl.h
@@ -1450,8 +1450,11 @@ GLAPI void APIENTRY glSamplePass( GLenum pass );
 
 
 /* Include external definitions of OpenGL extensions */
-#include <GL/glext.h>
-
+/* Removed, see this bug report for reference:
+ * http://sourceforge.net/tracker/index.php?func=detail&aid=610178&group_id=2435&atid=102435
+ * 
+ * #include <GL/glext.h>
+ */
 
 
 /************************************************************************

diff --git a/winsup/w32api/include/secext.h b/winsup/w32api/include/secext.h
new file mode 100644 (file)
index 0000000..1d5ee58
--- /dev/null
+++ b/winsup/w32api/include/secext.h
@@ -0,0 +1,24 @@
+#ifndef _SECEXT_H
+#define _SECEXT_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifndef RC_INVOKED
+#if (_WIN32_WINNT >= 0x0500)
+typedef enum 
+{
+  NameUnknown = 0, 
+  NameFullyQualifiedDN = 1, 
+  NameSamCompatible = 2, 
+  NameDisplay = 3, 
+  NameUniqueId = 6, 
+  NameCanonical = 7, 
+  NameUserPrincipal = 8, 
+  NameCanonicalEx = 9, 
+  NameServicePrincipal = 10, 
+  NameDnsDomain = 12
+} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;
+#endif /* ! RC_INVOKED */
+#endif /* _WIN32_WINNT >= 0x0500 */
+#endif /* ! _SECEXT_H */

diff --git a/winsup/w32api/include/security.h b/winsup/w32api/include/security.h
index 1d74c20..9685cf0 100644 (file)
--- a/winsup/w32api/include/security.h
+++ b/winsup/w32api/include/security.h
@@ -37,5 +37,6 @@ typedef long SECURITY_STATUS;
 
 #include <sspi.h>
 #include <ntsecpkg.h>
+#include <secext.h>
 
 #endif /* _SECURITY_H */

diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index c32909f..db1a27c 100644 (file)
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1608,6 +1608,18 @@ BOOL WINAPI AllocateUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR);
 BOOL WINAPI FreeUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR);
 BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR);
 BOOL WINAPI MapUserPhysicalPagesScatter(PVOID*,ULONG_PTR,PULONG_PTR);
+typedef enum _COMPUTER_NAME_FORMAT
+{
+  ComputerNameNetBIOS, 
+  ComputerNameDnsHostname, 
+  ComputerNameDnsDomain, 
+  ComputerNameDnsFullyQualified, 
+  ComputerNamePhysicalNetBIOS, 
+  ComputerNamePhysicalDnsHostname, 
+  ComputerNamePhysicalDnsDomain, 
+  ComputerNamePhysicalDnsFullyQualified, 
+  ComputerNameMax
+} COMPUTER_NAME_FORMAT;
 #endif
 
 #ifdef UNICODE