Thomas Faber : usp10: Fix build with MSVC.

Alexandre Julliard julliard at winehq.org
Fri Jan 27 11:30:40 CST 2012


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

Author: Thomas Faber <thfabba at gmx.de>
Date:   Fri Jan 27 00:09:10 2012 +0100

usp10: Fix build with MSVC.

---

 dlls/usp10/shape.c |   45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 5f71d6c..a893f7e 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -357,9 +357,6 @@ static const char* required_khmer_features[] =
     NULL
 };
 
-static OPENTYPE_FEATURE_RECORD no_features[] =
-{ };
-
 static OPENTYPE_FEATURE_RECORD ethiopic_features[] =
 {
     { MS_MAKE_TAG('c','c','m','p'), 1},
@@ -441,31 +438,31 @@ static const ScriptShapeData ShapingData[] =
     {{ standard_features, 2}, NULL, 0, NULL, NULL},
     {{ khmer_features, 5}, required_khmer_features, 0, ContextualShape_Khmer, ShapeCharGlyphProp_Khmer},
     {{ khmer_features, 5}, required_khmer_features, 0, ContextualShape_Khmer, ShapeCharGlyphProp_Khmer},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
     {{ ethiopic_features, 4}, NULL, 0, NULL, NULL},
     {{ ethiopic_features, 4}, NULL, 0, NULL, NULL},
     {{ mongolian_features, 4}, NULL, 0, ContextualShape_Mongolian, NULL},
     {{ mongolian_features, 4}, NULL, 0, ContextualShape_Mongolian, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
-    {{ no_features, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
+    {{ NULL, 0}, NULL, 0, NULL, NULL},
     {{ hebrew_features, 1}, NULL, 0, NULL, NULL},
     {{ latin_features, 2}, NULL, 0, NULL, NULL},
     {{ thai_features, 1}, NULL, 0, NULL, ShapeCharGlyphProp_Thai},




More information about the wine-cvs mailing list