From 1bd0b5ba7365fc7b4ef39e46efc66a6f25c052c5 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 18 Oct 2007 09:48:31 -0700 Subject: [PATCH] Eliminate relocations from FcCodePageRange structure (bug 10982). FcCodePageRange was using char pointers; replace them with char arrays. --- src/fcfreetype.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fcfreetype.c b/src/fcfreetype.c index c9c58c7..7773c83 100644 --- 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]) -- 2.39.2