From 2508955123dde8328e990533d3ec901ee8a5e2d0 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 26 Jan 2011 16:24:35 +0000
Subject: [PATCH] crt header compatibility update: - define _USE_MATH_DEFINES
 for dsound, gdiplus, jscript and some win32k files - don't define
 HAVE_LRINT(F) in libsamplerate - Remove M_PI constants from win32k

svn path=/trunk/; revision=50497
---
 reactos/dll/directx/dsound/dsound.rbuild                | 1 +
 reactos/dll/win32/gdiplus/gdiplus.rbuild                | 1 +
 reactos/dll/win32/jscript/jscript.rbuild                | 1 +
 reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild | 2 --
 reactos/subsystems/win32/win32k/objects/arc.c           | 2 ++
 reactos/subsystems/win32/win32k/objects/drawing.c       | 2 ++
 reactos/subsystems/win32/win32k/objects/path.c          | 3 ++-
 reactos/subsystems/win32/win32k/pch.h                   | 4 ----
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/reactos/dll/directx/dsound/dsound.rbuild b/reactos/dll/directx/dsound/dsound.rbuild
index 41453e41c93..fa66e5b99a9 100644
--- a/reactos/dll/directx/dsound/dsound.rbuild
+++ b/reactos/dll/directx/dsound/dsound.rbuild
@@ -6,6 +6,7 @@
 	<include base="dsound">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="_WINE" />
+	<define name="_USE_MATH_DEFINES" />
 	<library>wine</library>
 	<library>uuid</library>
 	<library>ntdll</library>
diff --git a/reactos/dll/win32/gdiplus/gdiplus.rbuild b/reactos/dll/win32/gdiplus/gdiplus.rbuild
index cc07c8c5d35..eb28fd84e9f 100644
--- a/reactos/dll/win32/gdiplus/gdiplus.rbuild
+++ b/reactos/dll/win32/gdiplus/gdiplus.rbuild
@@ -6,6 +6,7 @@
 	<include base="gdiplus">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
+	<define name="_USE_MATH_DEFINES" />
 	<file>brush.c</file>
 	<file>customlinecap.c</file>
 	<file>font.c</file>
diff --git a/reactos/dll/win32/jscript/jscript.rbuild b/reactos/dll/win32/jscript/jscript.rbuild
index f61a869af0b..4d31ff6f513 100644
--- a/reactos/dll/win32/jscript/jscript.rbuild
+++ b/reactos/dll/win32/jscript/jscript.rbuild
@@ -8,6 +8,7 @@
 	<include base="jscript" root="intermediate" compiler="rc">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
+	<define name="_USE_MATH_DEFINES" />
 	<define name="RPC_NO_WINDOWS_H" />
 	<dependency>jsglobal</dependency>
 	<library>wine</library>
diff --git a/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild b/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
index ce52f5871dd..0d72ab3f339 100644
--- a/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
+++ b/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="libsamplerate" type="staticlibrary" allowwarnings="true">
-	<define name="HAVE_LRINT" />
-	<define name="HAVE_LRINTF" />
 	<include base="libsamplerate">.</include>
 	<file>samplerate.c</file>
 	<file>src_linear.c</file>
diff --git a/reactos/subsystems/win32/win32k/objects/arc.c b/reactos/subsystems/win32/win32k/objects/arc.c
index 4cb7a55cf83..17d7f26d73e 100644
--- a/reactos/subsystems/win32/win32k/objects/arc.c
+++ b/reactos/subsystems/win32/win32k/objects/arc.c
@@ -1,4 +1,6 @@
 #include <win32k.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsystems/win32/win32k/objects/drawing.c b/reactos/subsystems/win32/win32k/objects/drawing.c
index 8b794938446..351c081731a 100755
--- a/reactos/subsystems/win32/win32k/objects/drawing.c
+++ b/reactos/subsystems/win32/win32k/objects/drawing.c
@@ -50,6 +50,8 @@ SUCH DAMAGE.
  */
 
 #include <win32k.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsystems/win32/win32k/objects/path.c b/reactos/subsystems/win32/win32k/objects/path.c
index 8a9010ced68..801e8e598c8 100644
--- a/reactos/subsystems/win32/win32k/objects/path.c
+++ b/reactos/subsystems/win32/win32k/objects/path.c
@@ -33,7 +33,8 @@
  */
 
 #include <win32k.h>
-#include "math.h"
+#define _USE_MATH_DEFINES
+#include <math.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsystems/win32/win32k/pch.h b/reactos/subsystems/win32/win32k/pch.h
index 8a39b1dba58..479f00a195e 100644
--- a/reactos/subsystems/win32/win32k/pch.h
+++ b/reactos/subsystems/win32/win32k/pch.h
@@ -70,10 +70,6 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 
 /* Undocumented stuff */
 typedef DRIVEROBJ *PDRIVEROBJ;
-#ifndef M_PI
-#define M_PI 3.14159265358979323846f
-#define M_PI_2 1.57079632679489661923
-#endif
 
 /* User heap */
 extern HANDLE GlobalUserHeap;