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

* include/specstrings.h (IN, OUT, OPTIONAL): Remove.
  * include/windef.h (IN, OUT, OPTIONAL): Define.
This commit is contained in:
Chris Sutcliffe 2008-02-12 01:31:52 +00:00
parent 74d928bf7a
commit 025ce65fcb
3 changed files with 24 additions and 12 deletions

View File

@ -1,3 +1,8 @@
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> 2008-02-02 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* include/specstrings.h: new file, move pseudo modifiers from windef.h. * include/specstrings.h: new file, move pseudo modifiers from windef.h.

View File

@ -6,8 +6,6 @@
/* __in and __out currently conflict with libstdc++, use with caution */ /* __in and __out currently conflict with libstdc++, use with caution */
#define IN
#define OUT
#define __in #define __in
#define __inout #define __inout
#define __in_opt #define __in_opt
@ -19,9 +17,6 @@
#define __struct_bcount(x) #define __struct_bcount(x)
#define __field_ecount_opt(x) #define __field_ecount_opt(x)
#define __out_bcount_opt(x) #define __out_bcount_opt(x)
#ifndef OPTIONAL
#define OPTIONAL
#endif
#endif #endif

View File

@ -55,6 +55,18 @@ extern "C" {
#define TRUE 1 #define TRUE 1
#endif #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__ #ifdef __GNUC__
#define PACKED __attribute__((packed)) #define PACKED __attribute__((packed))
#ifndef _fastcall #ifndef _fastcall