Alexandre Julliard : include: Don't define math functions or constants in wine/port.h.
Alexandre Julliard
julliard at winehq.org
Mon Oct 11 15:41:35 CDT 2021
Module: wine
Branch: master
Commit: edba76c826a54b01c0fe033c797b33e0165539ca
URL: https://source.winehq.org/git/wine.git/?a=commit;h=edba76c826a54b01c0fe033c797b33e0165539ca
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Oct 11 11:25:35 2021 +0200
include: Don't define math functions or constants in wine/port.h.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/unix/loader.c | 1 +
dlls/opengl32/wgl.c | 1 +
dlls/windowscodecs/libtiff.c | 1 +
dlls/winex11.drv/wintab.c | 1 +
include/wine/port.h | 13 -------------
5 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index dfc0d4c9a09..df309814c0c 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -30,6 +30,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <signal.h>
+#include <math.h>
#ifdef HAVE_LINK_H
# include <link.h>
#endif
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index cf46c6dfa8a..e2b514ffca9 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -24,6 +24,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include <math.h>
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c
index 1489fbe85fa..32d1f7bd8cb 100644
--- a/dlls/windowscodecs/libtiff.c
+++ b/dlls/windowscodecs/libtiff.c
@@ -25,6 +25,7 @@
#include "wine/port.h"
#include <stdarg.h>
+#include <math.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index 5cfc2b3a38d..c141ae88e71 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <stdarg.h>
+#include <math.h>
#include "windef.h"
#include "winbase.h"
diff --git a/include/wine/port.h b/include/wine/port.h
index 795a61f741b..00d3a8b5e3c 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -30,7 +30,6 @@
#endif
#include <fcntl.h>
-#include <math.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
@@ -70,16 +69,4 @@ static inline int symlink(const char *from, const char *to) { errno = ENOSYS; re
#endif /* _WIN32 */
-/****************************************************************
- * Constants
- */
-
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-#ifndef M_PI_2
-#define M_PI_2 1.570796326794896619
-#endif
-
#endif /* !defined(__WINE_WINE_PORT_H) */
More information about the wine-cvs
mailing list