Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jul 9 10:24:53 CDT 2007


Module: wine
Branch: master
Commit: 382329c103f7f5c6cfbf3acdb4e8dfee58d6dbb2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=382329c103f7f5c6cfbf3acdb4e8dfee58d6dbb2

Author: Francois Gouget <fgouget at free.fr>
Date:   Sat Jul  7 12:58:42 2007 +0200

ddraw/tests: Fix compilation on systems that don't support nameless unions.

---

 dlls/ddraw/tests/d3d.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index d628b98..6a062ca 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -1035,11 +1035,11 @@ static void Direct3D1Test(void)
             {D3DCLIP_FRONT, {-1.0}, {-1.0}, {-1.0}}, {0, { 0.5}, { 0.5}, {0.5}},
             {D3DCLIP_FRONT, {-0.5}, {-0.5}, {-0.5}}, {0, {-0.5}, {-0.5}, {0.0}}
         };
-        ok(cmpH[i].hx == outH[i].hx && cmpH[i].hy == outH[i].hy &&
-           cmpH[i].hz == outH[i].hz && cmpH[i].dwFlags == outH[i].dwFlags,
+        ok(U1(cmpH[i]).hx == U1(outH[i]).hx && U2(cmpH[i]).hy == U2(outH[i]).hy &&
+           U3(cmpH[i]).hz == U3(outH[i]).hz && cmpH[i].dwFlags == outH[i].dwFlags,
            "HVertex %d differs. Got %08x %f %f %f, expexted %08x %f %f %f\n", i + 1,
-           outH[i].dwFlags, outH[i].hx, outH[i].hy, outH[i].hz,
-           cmpH[i].dwFlags, cmpH[i].hx, cmpH[i].hy, cmpH[i].hz);
+           outH[i].dwFlags, U1(outH[i]).hx, U2(outH[i]).hy, U3(outH[i]).hz,
+           cmpH[i].dwFlags, U1(cmpH[i]).hx, U2(cmpH[i]).hy, U3(cmpH[i]).hz);
 
         /* No scheme has been found behind those return values. It seems to be
          * whatever data windows has when throwing the vertex away. Modify the




More information about the wine-cvs mailing list