Francois Gouget : d3dx9_36: Fix compilation on systems that don' t support nameless unions.

Alexandre Julliard julliard at winehq.org
Mon Jul 25 11:43:08 CDT 2011


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

Author: Francois Gouget <fgouget at free.fr>
Date:   Sat Jul 23 13:42:39 2011 +0200

d3dx9_36: Fix compilation on systems that don't support nameless unions.

---

 dlls/d3dx9_36/effect.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 499682c..47baf39 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -18,8 +18,10 @@
 
 #include "config.h"
 #include "wine/port.h"
+#define NONAMELESSUNION
 #include "wine/debug.h"
 #include "wine/unicode.h"
+
 #include "windef.h"
 #include "wingdi.h"
 #include "d3dx9_36_private.h"
@@ -897,9 +899,9 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix)
         for (k = 0; k < 4; ++k)
         {
             if ((i < param->rows) && (k < param->columns))
-                matrix->m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k);
+                matrix->u.m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k);
             else
-                matrix->m[i][k] = 0.0f;
+                matrix->u.m[i][k] = 0.0f;
         }
     }
 }




More information about the wine-cvs mailing list