From 595ee43c48dc75ebc03900b027d000ebd15dffd4 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Mon, 30 Nov 2020 14:37:39 +0100 Subject: [PATCH] msvcrt: Use _exception definiotion from public header. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcrt/math.c | 6 +++--- dlls/msvcrt/msvcrt.h | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0d42ca9a782..8efc6d3cdb2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -57,7 +57,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define _OVERFLOW 3 /* range overflow */ #define _UNDERFLOW 4 /* range underflow */ -typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); +typedef int (CDECL *MSVCRT_matherr_func)(struct _exception *); typedef double LDOUBLE; /* long double is just a double */ static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL; @@ -83,7 +83,7 @@ static inline float fp_barrierf(float x) /********************************************************************* * _matherr (CRTDLL.@) */ -int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) +int CDECL MSVCRT__matherr(struct _exception *e) { return 0; } @@ -91,7 +91,7 @@ int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) static double math_error(int type, const char *name, double arg1, double arg2, double retval) { - struct MSVCRT__exception exception = {type, (char *)name, arg1, arg2, retval}; + struct _exception exception = {type, (char *)name, arg1, arg2, retval}; TRACE("(%d, %s, %g, %g, %g)\n", type, debugstr_a(name), arg1, arg2, retval); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3d3a2d92dfe..4c1aaac2fb3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -287,14 +287,6 @@ typedef struct _iobuf MSVCRT_FILE; extern MSVCRT_FILE MSVCRT__iob[]; -struct MSVCRT__exception { - int type; - char* name; - double arg1; - double arg2; - double retval; -}; - typedef struct _complex _Dcomplex; struct MSVCRT__heapinfo {