Austin English : d3d8/d3d9: Fix compiler warnings on non x86/x86_64.
Alexandre Julliard
julliard at winehq.org
Fri Dec 3 09:31:43 CST 2010
Module: wine
Branch: master
Commit: b98c8ce556a858cb9b8aa9e6026ddf27d36da37c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98c8ce556a858cb9b8aa9e6026ddf27d36da37c
Author: Austin English <austinenglish at gmail.com>
Date: Thu Dec 2 19:41:17 2010 +0000
d3d8/d3d9: Fix compiler warnings on non x86/x86_64.
---
dlls/d3d8/tests/device.c | 4 ++--
dlls/d3d9/tests/device.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 1adedc3..ef040c1 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -1970,6 +1970,7 @@ static inline WORD get_fpu_cw(void)
static void test_fpu_setup(void)
{
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
D3DPRESENT_PARAMETERS present_parameters;
IDirect3DDevice8 *device;
D3DDISPLAYMODE d3ddm;
@@ -2032,6 +2033,7 @@ static void test_fpu_setup(void)
done:
if (window) DestroyWindow(window);
if (d3d8) IDirect3D8_Release(d3d8);
+#endif
}
static void test_ApplyStateBlock(void)
@@ -2121,9 +2123,7 @@ START_TEST(device)
}
IDirect3D8_Release(d3d8);
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
test_fpu_setup();
-#endif
test_display_modes();
test_shader_versions();
test_swapchain();
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index bb57917..671afbf 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -2811,6 +2811,7 @@ static inline WORD get_fpu_cw(void)
static void test_fpu_setup(void)
{
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
D3DPRESENT_PARAMETERS present_parameters;
IDirect3DDevice9 *device;
HWND window = NULL;
@@ -2868,6 +2869,7 @@ static void test_fpu_setup(void)
done:
if (window) DestroyWindow(window);
if (d3d9) IDirect3D9_Release(d3d9);
+#endif
}
START_TEST(device)
@@ -2891,9 +2893,7 @@ START_TEST(device)
}
IDirect3D9_Release(d3d9);
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
test_fpu_setup();
-#endif
test_multi_device();
test_display_formats();
test_display_modes();
More information about the wine-cvs
mailing list