Alexandre Julliard : ntdll: Remove math functions from the unixlib interface.
Alexandre Julliard
julliard at winehq.org
Tue Oct 26 16:19:19 CDT 2021
Module: wine
Branch: master
Commit: 1b9ada6cabd04ccb02c4ddcc82a53e62ea477948
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9ada6cabd04ccb02c4ddcc82a53e62ea477948
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Oct 26 10:34:11 2021 +0200
ntdll: Remove math functions from the unixlib interface.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/Makefile.in | 2 +-
dlls/ntdll/unix/loader.c | 24 ------------------------
dlls/ntdll/unixlib.h | 14 +-------------
3 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index ba23e397545..c40e7ba8242 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -4,7 +4,7 @@ UNIXLIB = ntdll.so
IMPORTLIB = ntdll
IMPORTS = winecrt0
EXTRAINCL = $(UNWIND_CFLAGS)
-EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) -lm
+EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS)
EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 0542d2bc865..ea7f18602da 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -30,7 +30,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <signal.h>
-#include <math.h>
#include <string.h>
#include <stdlib.h>
#include <sys/types.h>
@@ -2137,19 +2136,6 @@ static ULONG_PTR get_image_address(void)
}
-/* math function wrappers */
-static double CDECL ntdll_atan( double d ) { return atan( d ); }
-static double CDECL ntdll_ceil( double d ) { return ceil( d ); }
-static double CDECL ntdll_cos( double d ) { return cos( d ); }
-static double CDECL ntdll_fabs( double d ) { return fabs( d ); }
-static double CDECL ntdll_floor( double d ) { return floor( d ); }
-static double CDECL ntdll_log( double d ) { return log( d ); }
-static double CDECL ntdll_pow( double x, double y ) { return pow( x, y ); }
-static double CDECL ntdll_sin( double d ) { return sin( d ); }
-static double CDECL ntdll_sqrt( double d ) { return sqrt( d ); }
-static double CDECL ntdll_tan( double d ) { return tan( d ); }
-
-
/***********************************************************************
* unix_funcs
*/
@@ -2174,16 +2160,6 @@ static struct unix_funcs unix_funcs =
fast_RtlReleaseSRWLockShared,
fast_RtlWakeConditionVariable,
fast_wait_cv,
- ntdll_atan,
- ntdll_ceil,
- ntdll_cos,
- ntdll_fabs,
- ntdll_floor,
- ntdll_log,
- ntdll_pow,
- ntdll_sin,
- ntdll_sqrt,
- ntdll_tan,
load_so_dll,
init_builtin_dll,
init_unix_lib,
diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h
index 4b7c8b45be7..d56259deff2 100644
--- a/dlls/ntdll/unixlib.h
+++ b/dlls/ntdll/unixlib.h
@@ -26,7 +26,7 @@
struct _DISPATCHER_CONTEXT;
/* increment this when you change the function table */
-#define NTDLL_UNIXLIB_VERSION 126
+#define NTDLL_UNIXLIB_VERSION 127
struct unix_funcs
{
@@ -57,18 +57,6 @@ struct unix_funcs
NTSTATUS (CDECL *fast_wait_cv)( RTL_CONDITION_VARIABLE *variable, const void *value,
const LARGE_INTEGER *timeout );
- /* math functions */
- double (CDECL *atan)( double d );
- double (CDECL *ceil)( double d );
- double (CDECL *cos)( double d );
- double (CDECL *fabs)( double d );
- double (CDECL *floor)( double d );
- double (CDECL *log)( double d );
- double (CDECL *pow)( double x, double y );
- double (CDECL *sin)( double d );
- double (CDECL *sqrt)( double d );
- double (CDECL *tan)( double d );
-
/* loader functions */
NTSTATUS (CDECL *load_so_dll)( UNICODE_STRING *nt_name, void **module );
void (CDECL *init_builtin_dll)( void *module );
More information about the wine-cvs
mailing list