Module: wine Branch: master Commit: 9ccc0b1320e619c00a0c8b4ad83874c1f66868e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ccc0b1320e619c00a0c8b4ad...
Author: Alex Henrie alexhenrie24@gmail.com Date: Tue May 8 23:17:51 2018 -0600
msvcrt: Omit pointer coding functions from SOs for newer MSVC versions.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcrt/misc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c197d69..d760e17 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -426,7 +426,7 @@ int CDECL MSVCRT__resetstkoflw(void) return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); }
-#if _MSVCR_VER>=80 +#if _MSVCR_VER>=80 && _MSVCR_VER<=90
/********************************************************************* * _decode_pointer (MSVCR80.@) @@ -444,6 +444,9 @@ void * CDECL MSVCRT_encode_pointer(void * ptr) return EncodePointer(ptr); }
+#endif /* _MSVCR_VER>=80 && _MSVCR_VER<=90 */ + +#if _MSVCR_VER>=80 && _MSVCR_VER<=100 /********************************************************************* * _encoded_null (MSVCR80.@) */ @@ -453,8 +456,7 @@ void * CDECL _encoded_null(void)
return EncodePointer(NULL); } - -#endif /* _MSVCR_VER>=80 */ +#endif
#if _MSVCR_VER>=70 /*********************************************************************