Jacek Caban : include: Avoid _onexit_t redefinition.
Alexandre Julliard
julliard at winehq.org
Mon Apr 6 15:53:23 CDT 2020
Module: wine
Branch: master
Commit: d45e36f5f8253a3e122f874ceb707387f1ef5b33
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45e36f5f8253a3e122f874ceb707387f1ef5b33
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Apr 6 20:26:49 2020 +0200
include: Avoid _onexit_t redefinition.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48888
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/msvcrt/corecrt_startup.h | 3 +++
include/msvcrt/stdlib.h | 3 +++
2 files changed, 6 insertions(+)
diff --git a/include/msvcrt/corecrt_startup.h b/include/msvcrt/corecrt_startup.h
index 064f6fca27..58450b94ca 100644
--- a/include/msvcrt/corecrt_startup.h
+++ b/include/msvcrt/corecrt_startup.h
@@ -32,7 +32,10 @@ typedef struct _onexit_table_t {
_PVFV *_end;
} _onexit_table_t;
+#ifndef _CRT_ONEXIT_T_DEFINED
+#define _CRT_ONEXIT_T_DEFINED
typedef int (__cdecl *_onexit_t)(void);
+#endif
struct _exception;
typedef int (__cdecl *_UserMathErrorFunctionPointer)(struct _exception *);
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index f73f2ae384..2ce4789350 100644
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -136,7 +136,10 @@ errno_t __cdecl _get_errno(int*);
errno_t __cdecl _set_doserrno(int);
errno_t __cdecl _set_errno(int);
+#ifndef _CRT_ONEXIT_T_DEFINED
+#define _CRT_ONEXIT_T_DEFINED
typedef int (__cdecl *_onexit_t)(void);
+#endif
int __cdecl _atodbl(_CRT_DOUBLE*,char*);
More information about the wine-cvs
mailing list