2008-04-26 Danny Smith <dannysmith@users.sourceforge.net>

        * include/specstrings.h: Add more dummy defines.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index d4b4d4e..8cee348 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-26  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/specstrings.h: Add more dummy defines.
+
 2008-04-22  Corinna Vinschen  <corinna@vinschen.de>
 
        * include/winnt.h (SECURITY_MANDATORY_LABEL_AUTHORITY): Define.

diff --git a/winsup/w32api/include/specstrings.h b/winsup/w32api/include/specstrings.h
index 9a3c496..2d68471 100644 (file)
--- a/winsup/w32api/include/specstrings.h
+++ b/winsup/w32api/include/specstrings.h
@@ -1,22 +1,130 @@
-#ifndef _SPECSTRINGS_H\r
-#define _SPECSTRINGS_H\r
-#if __GNUC__ >=3\r
-#pragma GCC system_header\r
-#endif\r
-\r
-/* __in and __out currently conflict with libstdc++, use with caution */\r
-\r
-#define __in\r
-#define __inout\r
-#define __in_opt\r
-#define __in_bcount(x)\r
-#define __in_ecount(x)\r
-#define __out\r
-#define __out_ecount_part(x)\r
-#define __out_ecount_part(x,y)\r
-#define __struct_bcount(x)\r
-#define __field_ecount_opt(x)\r
-#define __out_bcount_opt(x)\r
-\r
-#endif\r
-\r
+#ifndef _SPECSTRINGS_H
+#define _SPECSTRINGS_H
+
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+/* These are built from primitives in Microsoft's Standard Annotation Language.
+   Search for "Header Annotation" on MSDN site for their MS-specific meanings */
+
+/* __in and __out currently conflict with libstdc++, use with caution */
+
+
+#define __bcount(size)
+#define __bcount_opt(size)
+#define __deref_bcount(size)
+#define __deref_bcount_opt(size)
+#define __deref_ecount(size)
+#define __deref_ecount_opt(size)
+#define __deref_in
+#define __deref_in_bcount(size)
+#define __deref_in_bcount_opt(size)
+#define __deref_in_ecount(size)
+#define __deref_in_ecount_opt(size)
+#define __deref_in_opt
+#define __deref_inout
+#define __deref_inout_bcount(size)
+#define __deref_inout_bcount_full(size)
+#define __deref_inout_bcount_full_opt(size)
+#define __deref_inout_bcount_opt(size)
+#define __deref_inout_bcount_part(size,length)
+#define __deref_inout_bcount_part_opt(size,length)
+#define __deref_inout_ecount(size)
+#define __deref_inout_ecount_full(size)
+#define __deref_inout_ecount_full_opt(size)
+#define __deref_inout_ecount_opt(size)
+#define __deref_inout_ecount_part(size,length)
+#define __deref_inout_ecount_part_opt(size,length)
+#define __deref_inout_opt
+#define __deref_opt_bcount(size)
+#define __deref_opt_bcount_opt(size)
+#define __deref_opt_ecount(size)
+#define __deref_opt_ecount_opt(size)
+#define __deref_opt_in
+#define __deref_opt_in_bcount(size)
+#define __deref_opt_in_bcount_opt(size)
+#define __deref_opt_in_ecount(size)
+#define __deref_opt_in_ecount_opt(size)
+#define __deref_opt_in_opt
+#define __deref_opt_inout
+#define __deref_opt_inout_bcount(size)
+#define __deref_opt_inout_bcount_full(size)
+#define __deref_opt_inout_bcount_full_opt(size)
+#define __deref_opt_inout_bcount_opt(size)
+#define __deref_opt_inout_bcount_part(size,length)
+#define __deref_opt_inout_bcount_part_opt(size,length)
+#define __deref_opt_inout_ecount(size)
+#define __deref_opt_inout_ecount_full(size)
+#define __deref_opt_inout_ecount_full_opt(size)
+#define __deref_opt_inout_ecount_opt(size)
+#define __deref_opt_inout_ecount_part(size,length)
+#define __deref_opt_inout_ecount_part_opt(size,length)
+#define __deref_opt_inout_opt
+#define __deref_opt_out
+#define __deref_opt_out_bcount(size)
+#define __deref_opt_out_bcount_full(size)
+#define __deref_opt_out_bcount_full_opt(size)
+#define __deref_opt_out_bcount_opt(size)
+#define __deref_opt_out_bcount_part(size,length)
+#define __deref_opt_out_bcount_part_opt(size,length)
+#define __deref_opt_out_ecount(size)
+#define __deref_opt_out_ecount_full(size)
+#define __deref_opt_out_ecount_full_opt(size)
+#define __deref_opt_out_ecount_opt(size)
+#define __deref_opt_out_ecount_part(size,length)
+#define __deref_opt_out_ecount_part_opt(size,length)
+#define __deref_opt_out_opt
+#define __deref_out
+#define __deref_out_bcount(size)
+#define __deref_out_bcount_full(size)
+#define __deref_out_bcount_full_opt(size)
+#define __deref_out_bcount_opt(size)
+#define __deref_out_bcount_part(size,length)
+#define __deref_out_bcount_part_opt(size,length)
+#define __deref_out_ecount(size)
+#define __deref_out_ecount_full(size)
+#define __deref_out_ecount_full_opt(size)
+#define __deref_out_ecount_opt(size)
+#define __deref_out_ecount_part(size,length)
+#define __deref_out_ecount_part_opt(size,length)
+#define __deref_out_opt
+#define __ecount(size)
+#define __ecount_opt(size)
+#define __in
+#define __in_bcount(size)
+#define __in_bcount_opt(size)
+#define __in_ecount(size)
+#define __in_ecount_opt(size)
+#define __in_opt
+#define __inout
+#define __inout_bcount(size)
+#define __inout_bcount_full(size)
+#define __inout_bcount_full_opt(size)
+#define __inout_bcount_opt(size)
+#define __inout_bcount_part(size,length)
+#define __inout_bcount_part_opt(size,length)
+#define __inout_ecount(size)
+#define __inout_ecount_full(size)
+#define __inout_ecount_full_opt(size)
+#define __inout_ecount_opt(size)
+#define __inout_ecount_part(size,length)
+#define __inout_ecount_part_opt(size,length)
+#define __inout_opt
+#define __out
+#define __out_bcount(size)
+#define __out_bcount_full(size)
+#define __out_bcount_full_opt(size)
+#define __out_bcount_opt(size)
+#define __out_bcount_part(size,length)
+#define __out_bcount_part_opt(size,length)
+#define __out_ecount(size)
+#define __out_ecount_full(size)
+#define __out_ecount_full_opt(size)
+#define __out_ecount_opt(size)
+#define __out_ecount_part(size,length)
+#define __out_ecount_part_opt(size,length)
+#define __out_opt 
+
+
+#endif /*_SPECSTRINGS_H */