Eliminate relocations from FcCodePageRange structure (bug 10982).
FcCodePageRange was using char pointers; replace them with char arrays.
This commit is contained in:
parent
96925b99c0
commit
1bd0b5ba73
|
@ -80,13 +80,13 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static const struct {
|
static const struct {
|
||||||
int bit;
|
char bit;
|
||||||
const FcChar8 *lang;
|
const FcChar8 lang[6];
|
||||||
} FcCodePageRange[] = {
|
} FcCodePageRange[] = {
|
||||||
{ 17, (const FcChar8 *) "ja" },
|
{ 17, "ja" },
|
||||||
{ 18, (const FcChar8 *) "zh-cn" },
|
{ 18, "zh-cn" },
|
||||||
{ 19, (const FcChar8 *) "ko" },
|
{ 19, "ko" },
|
||||||
{ 20, (const FcChar8 *) "zh-tw" },
|
{ 20, "zh-tw" },
|
||||||
};
|
};
|
||||||
|
|
||||||
#define NUM_CODE_PAGE_RANGE (int) (sizeof FcCodePageRange / sizeof FcCodePageRange[0])
|
#define NUM_CODE_PAGE_RANGE (int) (sizeof FcCodePageRange / sizeof FcCodePageRange[0])
|
||||||
|
|
Loading…
Reference in New Issue