From 19ba80e7c2c9ef054ef5faa921616a5d43f6578d Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Fri, 1 Jun 2012 16:56:21 +0200 Subject: [PATCH] wined3d: We must include Wine's port.h before using NAN. --- 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 468dfba559d..99d5e4332a6 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 #include diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index f1bf231fad3..680367a74eb 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 #include diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4037c41217e..b5db3e1bb50 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -20,10 +20,13 @@ */ #include "config.h" +#include "wine/port.h" + #include #ifdef HAVE_FLOAT_H # include #endif + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a0fbe8667be..be22421debc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -25,10 +25,13 @@ */ #include "config.h" +#include "wine/port.h" + #include #ifdef HAVE_FLOAT_H # include #endif + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f7e62a7b7a1..51839047518 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -22,7 +22,10 @@ */ #include "config.h" +#include "wine/port.h" + #include + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index 7ba21574e42..5a1a15a095d 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 #ifdef HAVE_FLOAT_H # include #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 d66522f33bc..f27b118e022 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 #include + #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 1fef98009e9..48eacd53891 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 #include diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 780c6a9e1f6..1e85be24236 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 8298058dd4f..4a3d7a77e43 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 3e1914dbeff..d7846224a89 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 d0472690a6c..1abafbbbd52 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -23,6 +23,7 @@ */ #include "config.h" +#include "wine/port.h" #include #include diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8904aaa9d1a..f2da77cc135 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -26,10 +26,13 @@ */ #include "config.h" +#include "wine/port.h" + #include #ifdef HAVE_FLOAT_H # include #endif + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 276c1a816fd..a09c2f9d213 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 14796d278ff..6600806b914 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 94589ae50d5..5a78700a8d0 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 af6ac92d86b..f3b42ff1a63 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 05bb4e553f6..6403b531f0d 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 4e2226e4690..08d1554c4f1 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"