[ros-diffs] [jgardou] 57124: [WINED3D] - MSVC needs INFINITY and NAN from wine/port.h. It can't be included from a header Will be sent upstream

Author: jgardou
Date: Tue Aug 21 13:38:02 2012
New Revision: 57124

URL: http://svn.reactos.org/svn/reactos?rev=57124&view=rev
Log:
[WINED3D]
- MSVC needs INFINITY and NAN from wine/port.h.
It can't be included from a header
Will be sent upstream

Modified:
    trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c
    trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c
    trunk/reactos/dll/directx/wine/wined3d/context.c
    trunk/reactos/dll/directx/wine/wined3d/device.c
    trunk/reactos/dll/directx/wine/wined3d/directx.c
    trunk/reactos/dll/directx/wine/wined3d/drawprim.c
    trunk/reactos/dll/directx/wine/wined3d/gl_compat.c
    trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c
    trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c
    trunk/reactos/dll/directx/wine/wined3d/palette.c
    trunk/reactos/dll/directx/wine/wined3d/query.c
    trunk/reactos/dll/directx/wine/wined3d/resource.c
    trunk/reactos/dll/directx/wine/wined3d/shader.c
    trunk/reactos/dll/directx/wine/wined3d/state.c
    trunk/reactos/dll/directx/wine/wined3d/stateblock.c
    trunk/reactos/dll/directx/wine/wined3d/swapchain.c
    trunk/reactos/dll/directx/wine/wined3d/texture.c
    trunk/reactos/dll/directx/wine/wined3d/utils.c
    trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c
    trunk/reactos/dll/directx/wine/wined3d/volume.c
    trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c
    trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h

Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] Tue Aug 21
13:38:02 2012
@@ -32,6 +32,7 @@
 #include <math.h>
 #include <stdio.h>
 
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);

Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c [iso-8859-1] Tue Aug 21
13:38:02 2012
@@ -23,6 +23,7 @@
 #include <math.h>
 #include <stdio.h>
 
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);

Modified: trunk/reactos/dll/directx/wine/wined3d/context.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/context.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -24,6 +24,7 @@
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/device.c [iso-8859-1] Tue Aug 21 13:38:02 2012
@@ -29,6 +29,7 @@
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -23,6 +23,7 @@
 
 #include "config.h"
 #include <stdio.h>
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/drawprim.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -25,6 +25,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw);

Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/gl_compat.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/gl_compat.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -23,6 +23,7 @@
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gl_compat);

Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -32,6 +32,7 @@
 #include "config.h"
 #include <limits.h>
 #include <stdio.h>
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);

Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c [iso-8859-1]
(original)
+++ trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c [iso-8859-1] Tue Aug 21
13:38:02 2012
@@ -24,6 +24,7 @@
 #include <math.h>
 #include <stdio.h>
 
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/palette.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -24,6 +24,7 @@
 
 #include <string.h>
 
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/query.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/query.c [iso-8859-1] Tue Aug 21 13:38:02 2012
@@ -20,6 +20,7 @@
 
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/resource.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/shader.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/shader.c [iso-8859-1] Tue Aug 21 13:38:02 2012
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);

Modified: trunk/reactos/dll/directx/wine/wined3d/state.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/state.c [iso-8859-1] Tue Aug 21 13:38:02 2012
@@ -30,6 +30,7 @@
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/stateblock.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/stateblock.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/swapchain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/swapchain.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/texture.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/texture.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture);

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] Tue Aug 21 13:38:02 2012
@@ -25,6 +25,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c [iso-8859-1] Tue Aug 21
13:38:02 2012
@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl);

Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/volume.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/volume.c [iso-8859-1] Tue Aug 21 13:38:02 2012
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);

Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c [iso-8859-1] Tue Aug 21 13:38:02
2012
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include "initguid.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Tue Aug 21
13:38:02 2012
@@ -37,7 +37,6 @@
 #include "winuser.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
-#include "wine/port.h"
 
 #include "objbase.h"
 #include "wine/wined3d.h"