[ros-diffs] [tkreuzer] 67723: [D3DX9_36/WINED3D] Partly revert previous changes, bringing back copysignf. Add global defines copysignf=_copysignf, since we have that now.

Author: tkreuzer
Date: Thu May 14 20:45:56 2015
New Revision: 67723

URL: http://svn.reactos.org/svn/reactos?rev=67723&view=rev
Log:
[D3DX9_36/WINED3D]
Partly revert previous changes, bringing back copysignf. Add global defines
copysignf=_copysignf, since we have that now.

Modified:
    trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
    trunk/reactos/dll/directx/wine/d3dx9_36/math.c
    trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt
    trunk/reactos/dll/directx/wine/wined3d/utils.c

Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt	[iso-8859-1] Thu May 14
20:45:56 2015
@@ -1,5 +1,5 @@
 
-add_definitions(-D__WINESRC__)
+add_definitions(-D__WINESRC__ -Dcopysignf=_copysignf)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB)
 

Modified: trunk/reactos/dll/directx/wine/d3dx9_36/math.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dx9_36/math.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dx9_36/math.c	[iso-8859-1] Thu May 14 20:45:56 2015
@@ -2118,7 +2118,7 @@
 {
     int exp = 0, origexp;
     float tmp = fabsf(in);
-    int sign = (in < 0);
+    int sign = (copysignf(1, in) < 0);
     unsigned int mantissa;
     unsigned short ret;
 

Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt	[iso-8859-1] Thu May 14 20:45:56
2015
@@ -2,7 +2,8 @@
 add_definitions(
     -D__WINESRC__
     -D_USE_MATH_DEFINES
-    -DUSE_WIN32_OPENGL)
+    -DUSE_WIN32_OPENGL
+    -Dcopysignf=_copysignf)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 

Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/utils.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/utils.c	[iso-8859-1] Thu May 14 20:45:56 2015
@@ -3987,7 +3987,7 @@
 {
     int idx = 1;
 
-    if (value < 0.0f)
+    if (copysignf(1.0f, value) < 0.0f)
         ++idx;
 
     /* Be sure to allocate a buffer of at least 17 characters for the result