Author: janderwald
Date: Fri Feb 18 15:09:22 2011
New Revision: 50805
URL: http://svn.reactos.org/svn/reactos?rev=50805&view=rev
Log:
- Fix for the fix (suggested by cmake doyen)
Modified:
branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c
Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt?rev=50805&r1=50804&r2=50805&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1]
Fri Feb 18 15:09:22 2011
@@ -7,6 +7,10 @@
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
set_rc_compiler()
+
+if(MSVC)
+ add_definitions(-Disnan=_isnan)
+endif()
spec2def(wined3.dll wined3d.spec)
Modified: branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c?rev=50805&r1=50804&r2=50805&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1]
Fri Feb 18 15:09:22 2011
@@ -43,7 +43,7 @@
/* Deal with special numbers */
if (*in == 0.0f) return 0x0000;
- if(_isnan(*in)) return 0x7C01;
+ if(isnan(*in)) return 0x7C01;
if (isinf(*in)) return (*in < 0.0f ? 0xFC00 : 0x7c00);
if(tmp < powf(2, 10)) {
