2008-02-02 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>

  * include/specstrings.h (IN, OUT, OPTIONAL): Remove.
  * include/windef.h (IN, OUT, OPTIONAL): Define.

3 files changed, 24 insertions, 12 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9213dc8fa..b5cb2e50c 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,10 @@
 2008-02-02  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
+  * include/specstrings.h (IN, OUT, OPTIONAL): Remove.
+  * include/windef.h (IN, OUT, OPTIONAL): Define.
+
+2008-02-02  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
 	* include/specstrings.h: new file, move pseudo modifiers from windef.h.
 	* include/windef.h (__in, __inout, __in_opt, __in_bcound, __in_ecount,
 	__out, __out_ecount_part, __struct_bcount, __field_ecount_opt,
@@ -17,9 +22,9 @@
 
 2008-01-29  Brandon Sneed  <nivenh@sourceware.org>
 	* include/ras.h (RAS_MaxDnsSuffix): corrected typo, was RAX_MaxDnsSuffix.
-	(RASENTRYA, RASENTRYW): Added members (dwfOptions2, dwfOptions3, szDnsSuffix, 
+	(RASENTRYA, RASENTRYW): Added members (dwfOptions2, dwfOptions3, szDnsSuffix,
 	dwTcpWindowSize, szPrerequisitePbk, szPrerequisiteEntry, dwRedialCount,
-	dwRedialPause.	
+	dwRedialPause.
 
 2008-01-29  Brandon Sneed  <nivenh@sourceware.org>
 
@@ -43,7 +48,7 @@
 
 2008-01-29  Brandon Sneed  <nivenh@sourceware.org>
 
-	* include/psapi.h (GetProcessImageFileNameA, GetProcessImageFileNameW): 
+	* include/psapi.h (GetProcessImageFileNameA, GetProcessImageFileNameW):
 	Add prototypes.
 	* lib/psapi.def (GetProcessImageFileNameA@12, GetProcessImageFileNameW@12):
 	Add exports.
@@ -139,7 +144,7 @@
 	* include/rpcndr.h: Missing NdrClientCall2 entry.
 	* lib/rpcrt4.def: Ditto.
 
-2007-10-03  Frank Fesevur  <ffes@users.sourceforge.net> 
+2007-10-03  Frank Fesevur  <ffes@users.sourceforge.net>
 	* lib/scnsave.c: Multi-monitor support.
 
 2007-08-03  Chris Sutcliffe  <ir0nh34d@users.sf.net>
@@ -199,7 +204,7 @@
 	[mingw-Bugs-1751565]
 	* include/basetyps.h (IID); Guard with __IID_DEFINED__.
 
-	[mingw-Bugs-1751595] 
+	[mingw-Bugs-1751595]
 	* include/exdisp.h (DWebBrowserEvents2): Remove undocumented STDDISP
 	methods.
 
@@ -214,7 +219,7 @@
 2007-07-09  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	[mingw-Bugs-1749305]
-	* lib/kernel32.def (GetConsoleProcessList@8):  Add export. 
+	* lib/kernel32.def (GetConsoleProcessList@8):  Add export.
 
 2007-07-02  Przemek Czerkas  <pczerkas@gmail.com>
 
diff --git a/winsup/w32api/include/specstrings.h b/winsup/w32api/include/specstrings.h
index d5ee7f69d..9a3c496ac 100644
--- a/winsup/w32api/include/specstrings.h
+++ b/winsup/w32api/include/specstrings.h
@@ -6,8 +6,6 @@
 

 /* __in and __out currently conflict with libstdc++, use with caution */

 

-#define IN

-#define OUT

 #define __in

 #define __inout

 #define __in_opt

@@ -19,9 +17,6 @@
 #define __struct_bcount(x)

 #define __field_ecount_opt(x)

 #define __out_bcount_opt(x)

-#ifndef OPTIONAL

-#define OPTIONAL

-#endif

 

 #endif

 

diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h
index 4e7c44e0d..793591cb2 100644
--- a/winsup/w32api/include/windef.h
+++ b/winsup/w32api/include/windef.h
@@ -55,6 +55,18 @@ extern "C" {
 #define TRUE 1
 #endif
 
+/* Pseudo modifiers for parameters
+   We don't use these unnecessary defines in the w32api headers. Define
+   them by default since that is what people expect, but allow users
+   to avoid the pollution.  */
+#ifndef _NO_W32_PSEUDO_MODIFIERS
+#define IN
+#define OUT
+#ifndef OPTIONAL
+#define OPTIONAL
+#endif
+#endif
+
 #ifdef __GNUC__
 #define PACKED __attribute__((packed))
 #ifndef _fastcall
@@ -146,7 +158,7 @@ extern "C" {
 
 #ifndef NONAMELESSUNION
 #ifdef __GNUC__
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
 #define _ANONYMOUS_UNION __extension__
 #define _ANONYMOUS_STRUCT __extension__
 #else