From e331d3e26e0dc9f6b80ae3ece78661d741822474 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Sat, 26 Apr 2008 12:07:35 +0000 Subject: [PATCH] 2008-04-26 Danny Smith * include/specstrings.h: Add more dummy defines. --- winsup/w32api/ChangeLog | 4 + winsup/w32api/include/specstrings.h | 152 ++++++++++++++++++++++++---- 2 files changed, 134 insertions(+), 22 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index d4b4d4e47..8cee34821 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,7 @@ +2008-04-26 Danny Smith + + * include/specstrings.h: Add more dummy defines. + 2008-04-22 Corinna Vinschen * include/winnt.h (SECURITY_MANDATORY_LABEL_AUTHORITY): Define. diff --git a/winsup/w32api/include/specstrings.h b/winsup/w32api/include/specstrings.h index 9a3c496ac..2d68471b5 100644 --- a/winsup/w32api/include/specstrings.h +++ b/winsup/w32api/include/specstrings.h @@ -1,22 +1,130 @@ -#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 __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) - -#endif - +#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 */