From 025ce65fcbd2f1e783b86d9708031a1ea7a7e172 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Tue, 12 Feb 2008 01:31:52 +0000 Subject: 2008-02-02 Chris Sutcliffe * include/specstrings.h (IN, OUT, OPTIONAL): Remove. * include/windef.h (IN, OUT, OPTIONAL): Define. --- winsup/w32api/ChangeLog | 17 +++++++++++------ winsup/w32api/include/specstrings.h | 5 ----- winsup/w32api/include/windef.h | 14 +++++++++++++- 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,3 +1,8 @@ +2008-02-02 Chris Sutcliffe + + * include/specstrings.h (IN, OUT, OPTIONAL): Remove. + * include/windef.h (IN, OUT, OPTIONAL): Define. + 2008-02-02 Chris Sutcliffe * include/specstrings.h: new file, move pseudo modifiers from windef.h. @@ -17,9 +22,9 @@ 2008-01-29 Brandon Sneed * 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 @@ -43,7 +48,7 @@ 2008-01-29 Brandon Sneed - * 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 +2007-10-03 Frank Fesevur * lib/scnsave.c: Multi-monitor support. 2007-08-03 Chris Sutcliffe @@ -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 [mingw-Bugs-1749305] - * lib/kernel32.def (GetConsoleProcessList@8): Add export. + * lib/kernel32.def (GetConsoleProcessList@8): Add export. 2007-07-02 Przemek Czerkas 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 -- cgit v1.2.3