wined3d: We must include Wine's port.h before using NAN.

Francois Gouget fgouget at free.fr
Fri Jun 1 09:56:21 CDT 2012


This fixes the compilation on Solaris.
---
 dlls/wined3d/arb_program_shader.c    |    1 +
 dlls/wined3d/ati_fragment_shader.c   |    1 +
 dlls/wined3d/context.c               |    3 +++
 dlls/wined3d/device.c                |    3 +++
 dlls/wined3d/directx.c               |    3 +++
 dlls/wined3d/gl_compat.c             |    3 +++
 dlls/wined3d/glsl_shader.c           |    3 +++
 dlls/wined3d/nvidia_texture_shader.c |    1 +
 dlls/wined3d/palette.c               |    1 +
 dlls/wined3d/query.c                 |    1 +
 dlls/wined3d/resource.c              |    1 +
 dlls/wined3d/shader.c                |    1 +
 dlls/wined3d/state.c                 |    3 +++
 dlls/wined3d/stateblock.c            |    1 +
 dlls/wined3d/swapchain.c             |    1 +
 dlls/wined3d/texture.c               |    1 +
 dlls/wined3d/vertexdeclaration.c     |    1 +
 dlls/wined3d/volume.c                |    1 +
 dlls/wined3d/wined3d_main.c          |    1 +
 19 files changed, 31 insertions(+)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 468dfba..99d5e43 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -28,6 +28,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <math.h>
 #include <stdio.h>
diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c
index f1bf231..680367a 100644
--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <math.h>
 #include <stdio.h>
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 4037c41..b5db3e1 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -20,10 +20,13 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <stdio.h>
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
+
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index a0fbe86..be22421 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -25,10 +25,13 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <stdio.h>
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
+
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index f7e62a7..5183904 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -22,7 +22,10 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <stdio.h>
+
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c
index 7ba2157..5a1a15a 100644
--- a/dlls/wined3d/gl_compat.c
+++ b/dlls/wined3d/gl_compat.c
@@ -19,10 +19,13 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <stdio.h>
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
+
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gl_compat);
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index d66522f..f27b118 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -30,8 +30,11 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <limits.h>
 #include <stdio.h>
+
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c
index 1fef980..48eacd5 100644
--- a/dlls/wined3d/nvidia_texture_shader.c
+++ b/dlls/wined3d/nvidia_texture_shader.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 #include "config.h"
+#include "wine/port.h"
 
 #include <math.h>
 #include <stdio.h>
diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c
index 780c6a9..1e85be2 100644
--- a/dlls/wined3d/palette.c
+++ b/dlls/wined3d/palette.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 #include "config.h"
+#include "wine/port.h"
 #include "winerror.h"
 #include "wine/debug.h"
 
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 8298058..4a3d7a7 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -20,6 +20,7 @@
 
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 3e1914d..d784622 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index d047269..1abafbb 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <math.h>
 #include <stdio.h>
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 8904aaa..f2da77c 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -26,10 +26,13 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <stdio.h>
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
+
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 276c1a8..a09c2f9 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 14796d2..6600806 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 94589ae..5a78700 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture);
diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c
index af6ac92..f3b42ff 100644
--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl);
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 05bb4e5..6403b53 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 #include "wined3d_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface);
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 4e2226e..08d1554 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include "initguid.h"
 #include "wined3d_private.h"
-- 
1.7.10



More information about the wine-patches mailing list