From eb64df8ebdc2c2d06c141c0a352acb4152a2a862 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 23 Nov 2010 11:47:50 +0000 Subject: [PATCH] [PSDK] Don't define __in and __null on c++ build. as long as we keep using host headers, this won't work svn path=/trunk/; revision=49723 --- reactos/include/psdk/specstrings.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/reactos/include/psdk/specstrings.h b/reactos/include/psdk/specstrings.h index 568bb983e04..de2c0bae219 100644 --- a/reactos/include/psdk/specstrings.h +++ b/reactos/include/psdk/specstrings.h @@ -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