[ros-diffs] [tkreuzer] 50497: 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 constant...

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Wed Jan 26 16:24:35 UTC 2011 

Author: tkreuzer
Date: Wed Jan 26 16:24:35 2011
New Revision: 50497

URL: http://svn.reactos.org/svn/reactos?rev=50497&view=rev
Log:
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

Modified:
    trunk/reactos/dll/directx/dsound/dsound.rbuild
    trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild
    trunk/reactos/dll/win32/jscript/jscript.rbuild
    trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
    trunk/reactos/subsystems/win32/win32k/objects/arc.c
    trunk/reactos/subsystems/win32/win32k/objects/drawing.c
    trunk/reactos/subsystems/win32/win32k/objects/path.c
    trunk/reactos/subsystems/win32/win32k/pch.h

Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.rbuild?rev=50497&r1=50496&r2=50497&view=diff
==============================================================================
--- trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] Wed Jan 26 16:24:35 2011
@@ -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>

Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild?rev=50497&r1=50496&r2=50497&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] Wed Jan 26 16:24:35 2011
@@ -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>

Modified: trunk/reactos/dll/win32/jscript/jscript.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.rbuild?rev=50497&r1=50496&r2=50497&view=diff
==============================================================================
--- trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] Wed Jan 26 16:24:35 2011
@@ -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>

Modified: trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild?rev=50497&r1=50496&r2=50497&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libsamplerate/libsamplerate.rbuild [iso-8859-1] Wed Jan 26 16:24:35 2011
@@ -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>

Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/arc.c?rev=50497&r1=50496&r2=50497&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Wed Jan 26 16:24:35 2011
@@ -1,4 +1,6 @@
 #include <win32k.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
 
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/drawing.c?rev=50497&r1=50496&r2=50497&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Wed Jan 26 16:24:35 2011
@@ -50,6 +50,8 @@
  */
 
 #include <win32k.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
 
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/path.c?rev=50497&r1=50496&r2=50497&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Wed Jan 26 16:24:35 2011
@@ -33,7 +33,8 @@
  */
 
 #include <win32k.h>
-#include "math.h"
+#define _USE_MATH_DEFINES
+#include <math.h>
 
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/subsystems/win32/win32k/pch.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pch.h?rev=50497&r1=50496&r2=50497&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Wed Jan 26 16:24:35 2011
@@ -70,10 +70,6 @@
 
 /* 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;

More information about the Ros-diffs mailing list