[ros-diffs] [tkreuzer] 49723: [PSDK] Don't define __in and __null on c++ build. as long as we keep using host headers, this won't work

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Tue Nov 23 11:47:50 UTC 2010


Author: tkreuzer
Date: Tue Nov 23 11:47:50 2010
New Revision: 49723

URL: http://svn.reactos.org/svn/reactos?rev=49723&view=rev
Log:
[PSDK]
Don't define __in and __null on c++ build. as long as we keep using host headers, this won't work

Modified:
    trunk/reactos/include/psdk/specstrings.h

Modified: trunk/reactos/include/psdk/specstrings.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/specstrings.h?rev=49723&r1=49722&r2=49723&view=diff
==============================================================================
--- trunk/reactos/include/psdk/specstrings.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/specstrings.h [iso-8859-1] Tue Nov 23 11:47:50 2010
@@ -29,7 +29,9 @@
 #define __deref_opt_in_bcount_opt(size)
 #define __out_awcount(expr,size)
 #define __in_awcount(expr,size)
+#ifndef __cplusplus
 #define __null
+#endif
 #define __notnull
 #define __maybenull
 #define __readonly
@@ -64,7 +66,9 @@
 #define __inner_data_entrypoint(category)
 #define __ecount(size)
 #define __bcount(size)
+#ifndef __cplusplus
 #define __in
+#endif
 #define __in_opt
 #define __in_nz
 #define __in_nz_opt
@@ -270,4 +274,5 @@
 #define __analysis_assume(expr)
 #endif
 
-
+//#endif
+




More information about the Ros-diffs mailing list