[PATCH 5/5] d3dx9_36: Make NUM_ELEM a define.

Stefan Dösinger stefan at codeweavers.com
Wed Jan 1 12:01:45 CST 2014


Otherwise Visual Studio complains that the array size of v1 and v2 is not
constant.
---
 dlls/d3dx9_36/mesh.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 90f004b..094180e 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -6398,7 +6398,7 @@ static BOOL weld_float16_2(void *to, void *from, FLOAT epsilon)
     FLOAT diff_x;
     FLOAT diff_y;
     FLOAT max_abs_diff;
-    const UINT NUM_ELEM = 2;
+#define NUM_ELEM 2
     FLOAT v1[NUM_ELEM];
     FLOAT v2[NUM_ELEM];
 
@@ -6417,6 +6417,7 @@ static BOOL weld_float16_2(void *to, void *from, FLOAT epsilon)
     }
 
     return FALSE;
+#undef NUM_ELEM
 }
 
 static BOOL weld_float16_4(void *to, void *from, FLOAT epsilon)
@@ -6428,7 +6429,7 @@ static BOOL weld_float16_4(void *to, void *from, FLOAT epsilon)
     FLOAT diff_z;
     FLOAT diff_w;
     FLOAT max_abs_diff;
-    const UINT NUM_ELEM = 4;
+#define NUM_ELEM 4
     FLOAT v1[NUM_ELEM];
     FLOAT v2[NUM_ELEM];
 
@@ -6451,6 +6452,7 @@ static BOOL weld_float16_4(void *to, void *from, FLOAT epsilon)
     }
 
     return FALSE;
+#undef NUM_ELEM
 }
 
 /* Sets the vertex components to the same value if they are within epsilon. */
-- 
1.8.3.2




More information about the wine-patches mailing list