Eliminate relocations from FcCodePageRange structure (bug 10982).

FcCodePageRange was using char pointers; replace them with char arrays.

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index c9c58c746f61023a88c2ad4c3b5e1e1cdbc3c6c1..7773c836c215df3b32c4ae6968d185ee270097bb 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -80,13 +80,13 @@
  */
 
 static const struct {
-    int                    bit;
-    const FcChar8   *lang;
+    char           bit;
+    const FcChar8   lang[6];
 } FcCodePageRange[] = {
-    { 17,      (const FcChar8 *) "ja" },
-    { 18,      (const FcChar8 *) "zh-cn" },
-    { 19,      (const FcChar8 *) "ko" },
-    { 20,      (const FcChar8 *) "zh-tw" },
+    { 17,      "ja" },
+    { 18,      "zh-cn" },
+    { 19,      "ko" },
+    { 20,      "zh-tw" },
 };
 
 #define NUM_CODE_PAGE_RANGE (int) (sizeof FcCodePageRange / sizeof FcCodePageRange[0])