* include/accctrl.h (_ACCCTRL_H): Correct typo.

	Remove unnecessary inclusion of <wtypes.h>
	* ChangeLog: Fix omission of name in recent entries.

	* include/initguid.h (DEFINE_GUID): Add GUID_EXT to define.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4a0a166..55740a0 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,11 +1,21 @@
-2002-03-06  dannysmith@users.sourceforge.net
+2002-03-08  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/accctrl.h (_ACCCTRL_H): Correct typo.
+       Remove unnecessary inclusion of <wtypes.h>.
+       * ChangeLog: Fix omission of name in recent entries.
+
+2002-03-08  Antony Blakey  <antony.blakey@ihug.com.au>
+
+       * include/initguid.h (DEFINE_GUID): Add GUID_EXT to define.
+
+2002-03-06  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/mswsock.h: Group winsock2 dependants
        together and protect with #ifdef _WINSOCK2_H.
        * lib/test.c: Only test ws2tcpip.h if winsock2.h
        has been included.
 
-2002-03-05  dannysmith@users.sourceforge.net
+2002-03-05  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/mswsock.h (TP_*): Add new defines.
        (TRANSMIT_PACKETS_ELEMENT): Define new structure.
@@ -15,7 +25,7 @@
        (WSARecvMsg): Likewise.
        (WSA_CMSG_*) Add empty macros, guarded by #if 0.
 
-2002-03-02  dannysmith@users.sourceforge.net
+2002-03-02  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * ChangeLog: Fix typo in last entry. 
        * include/winsock2.h (IPPROTO_*): Add IPv6 defines.
@@ -50,7 +60,7 @@
        (INTERFACE_INFO_OLD): Add comment on workaround for problems
        with INTERFACE_INFO on NT4 prior to sp4.
 
-2002-02-28  dannysmith@users.sourceforge.net
+2002-02-28  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/windows.h; Remove test for __W32API_MAJOR_VERSION
        when selecting winsock interface.

diff --git a/winsup/w32api/include/accctrl.h b/winsup/w32api/include/accctrl.h
index 3db4279..a0254e5 100644 (file)
--- a/winsup/w32api/include/accctrl.h
+++ b/winsup/w32api/include/accctrl.h
@@ -1,6 +1,5 @@
-#ifndef _ACCCRTL_H
-#define _ACCCRTL_H
-#include <wtypes.h>
+#ifndef _ACCCTRL_H
+#define _ACCCTRL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -309,4 +308,4 @@ typedef OBJECTS_AND_NAME_A OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_;
 }
 #endif
 
-#endif /* _ACCCRTL_H */
+#endif /* _ACCCTRL_H */

diff --git a/winsup/w32api/include/initguid.h b/winsup/w32api/include/initguid.h
index 08092a2..156d564 100644 (file)
--- a/winsup/w32api/include/initguid.h
+++ b/winsup/w32api/include/initguid.h
@@ -4,5 +4,5 @@
 #include <basetyps.h>
 #endif
 #undef DEFINE_GUID
-#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) GUID_EXT const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
 #endif