Module: wine Branch: master Commit: 1c9b843ecf821d3caf43668c43bf0280c793b25d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9b843ecf821d3caf43668c4...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 3 10:42:07 2021 +0100
include: Don't define __in and __out.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51919 Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/sal.h | 4 ++-- libs/jxr/jxrgluelib/JXRMeta.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/sal.h b/include/sal.h index 680f97f9250..f11e744aa51 100644 --- a/include/sal.h +++ b/include/sal.h @@ -344,7 +344,7 @@ #define __ecount(size) #define __ecount_opt(size)
-#define __in +/* #define __in */ /* conflicts with system headers */ #define __in_bcount(size) #define __in_bcount_nz(size) #define __in_bcount_nz_opt(size) @@ -390,7 +390,7 @@ #define __inout_z #define __inout_z_opt
-#define __out +/* #define __out */ /* conflicts with system headers */ #define __out_bcount(size) #define __out_bcount_full(size) #define __out_bcount_full_opt(size) diff --git a/libs/jxr/jxrgluelib/JXRMeta.h b/libs/jxr/jxrgluelib/JXRMeta.h index 53215041d70..81b12ea063c 100644 --- a/libs/jxr/jxrgluelib/JXRMeta.h +++ b/libs/jxr/jxrgluelib/JXRMeta.h @@ -107,8 +107,8 @@
#ifdef WIN32 -#define __in_win __in -#define __out_win __out +#define __in_win +#define __out_win #endif