diff --git a/reactos/include/psdk/sal.h b/reactos/include/psdk/sal.h index e3318b20ff5..321725360b6 100644 --- a/reactos/include/psdk/sal.h +++ b/reactos/include/psdk/sal.h @@ -423,6 +423,7 @@ enum __SAL_YesNo {_SAL_notpresent, _SAL_no, _SAL_maybe, _SAL_yes, _SAL_default}; #define _Analysis_noreturn_ _SAL2_NAME(_Analysis_noreturn_) [SAL_annotes(Name="SAL_terminates")] #define _Analysis_assume_(expr) __assume(expr) +#define __analysis_assume(expr) __assume(expr) #define _Check_return_ _SAL2_NAME(_Check_return_) [SA_Post(MustCheck=SA_Yes)] #define _COM_Outptr_ _SAL2_NAME(_COM_Outptr_) _Group_(_Outptr_ _On_failure_(_Deref_post_null_)) @@ -1098,7 +1099,8 @@ __PRIMOP(int, _In_function_class_(__In_impl_ char*);) #define __inner_typefix(ctype) #define _Always_(annos) #define _Analysis_noreturn_ -#define _Analysis_assume_(expr) +#define _Analysis_assume_(expr) ((void)0) +#define __analysis_assume(expr) ((void)0) #define _At_(target, annos) #define _At_buffer_(target, iter, bound, annos) #define _Check_return_ diff --git a/reactos/include/psdk/sal_old.h b/reactos/include/psdk/sal_old.h index 9b93826d4e9..ddf3fbd4db0 100644 --- a/reactos/include/psdk/sal_old.h +++ b/reactos/include/psdk/sal_old.h @@ -69,9 +69,6 @@ #define __refparam __deref __notreadonly #define __valid __declspec("SAL_valid") #define __writableTo(size) __declspec("SAL_writableTo("SPECSTRINGIZE(size)")") -#ifndef __analysis_assume -#define __analysis_assume(expr) __assume(expr) -#endif #else @@ -108,9 +105,6 @@ #define __refparam #define __valid #define __writableTo(size) -#ifndef __analysis_assume -#define __analysis_assume(expr) -#endif #endif /* defined(_PREFAST_) && !defined(__midl) */