diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2008-02-02 16:19:23 +0300 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2008-02-02 16:19:23 +0300 |
| commit | efab44e052984eba6c100bc5d4d29f3b7e09cac6 (patch) | |
| tree | eab832b37f78ee215a11fd5771030517734a86b3 | |
| parent | a1e856cc947784da2840fe53f92630681bc1d4d5 (diff) | |
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,
__out_bcount_opt): Move to specstrings.h.
| -rw-r--r-- | winsup/w32api/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/specstrings.h | 27 | ||||
| -rw-r--r-- | winsup/w32api/include/windef.h | 23 |
3 files changed, 34 insertions, 23 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index eea4796ee..9213dc8fa 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +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, + __out_bcount_opt): Move to specstrings.h. + 2008-01-30 Brandon Sneed <nivenh@sourceware.org> * lib/bthprops.def: new file, bluetooth imports. diff --git a/winsup/w32api/include/specstrings.h b/winsup/w32api/include/specstrings.h new file mode 100644 index 000000000..d5ee7f69d --- /dev/null +++ b/winsup/w32api/include/specstrings.h @@ -0,0 +1,27 @@ +#ifndef _SPECSTRINGS_H
+#define _SPECSTRINGS_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+/* __in and __out currently conflict with libstdc++, use with caution */
+
+#define IN
+#define OUT
+#define __in
+#define __inout
+#define __in_opt
+#define __in_bcount(x)
+#define __in_ecount(x)
+#define __out
+#define __out_ecount_part(x)
+#define __out_ecount_part(x,y)
+#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 5dd04013c..4e7c44e0d 100644 --- a/winsup/w32api/include/windef.h +++ b/winsup/w32api/include/windef.h @@ -55,29 +55,6 @@ 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 -#define __in -#define __inout -#define __in_opt -#define __in_bcount(x) -#define __in_ecount(x) -#define __out -#define __out_ecount_part(x) -#define __out_ecount_part(x,y) -#define __struct_bcount(x) -#define __field_ecount_opt(x) -#define __out_bcount_opt(x) -#ifndef OPTIONAL -#define OPTIONAL -#endif -#endif - #ifdef __GNUC__ #define PACKED __attribute__((packed)) #ifndef _fastcall |