walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[arch] Try to ensure proper FcLangSet alignment in arch

This commit is contained in:
Behdad Esfahbod 2009-11-16 17:38:40 -05:00
parent dffcb2a083
commit 8480c6f863
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fc-arch/fc-arch.c
View File

@ -25,7 +25,7 @@
#include <ctype.h> #include <ctype.h>
#define ENDIAN_TEST 0x12345678 #define ENDIAN_TEST 0x12345678
#define MACHINE_SIGNATURE_SIZE (9*22 + 1) #define MACHINE_SIGNATURE_SIZE (9*23 + 1)
static char * static char *
FcCacheMachineSignature (void) FcCacheMachineSignature (void)
@ -36,7 +36,7 @@ FcCacheMachineSignature (void)
sprintf (buf, "%2x%2x%2x%2x_" sprintf (buf, "%2x%2x%2x%2x_"
"%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_" "%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_"
"%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x", "%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x_%08x",
m[0], m[1], m[2], m[3], m[0], m[1], m[2], m[3],
(unsigned int)sizeof (FcAlign), (unsigned int)sizeof (FcAlign),
(unsigned int)sizeof (char), (unsigned int)sizeof (char),
@ -52,6 +52,7 @@ FcCacheMachineSignature (void)
(unsigned int)sizeof (FcValue), (unsigned int)sizeof (FcValue),
(unsigned int)sizeof (FcValueBinding), (unsigned int)sizeof (FcValueBinding),
(unsigned int)sizeof (struct FcValueList *), (unsigned int)sizeof (struct FcValueList *),
(unsigned int)sizeof (FcStrSet *), /* For FcLangSet */
(unsigned int)sizeof (FcCharSet), (unsigned int)sizeof (FcCharSet),
(unsigned int)sizeof (FcCharLeaf **), (unsigned int)sizeof (FcCharLeaf **),
(unsigned int)sizeof (FcChar16 *), (unsigned int)sizeof (FcChar16 *),

16
fc-arch/fcarch.tmpl.h
View File

@ -28,11 +28,11 @@
@@@ name. Architecture names are used to construct file names, so @@@ name. Architecture names are used to construct file names, so
@@@ use something reasonable and don't include any spaces @@@ use something reasonable and don't include any spaces
@@@ @@@
@@@ name endian FcAlign char char* int intptr_t Pattern EltPtr Elt * Elt ObjPtr VLPtr Value Binding VL * CharSet Leaf** Char16 * Char16 Leaf Char32 Cache @@@ name endian FcAlign char char* int intptr_t Pattern EltPtr Elt * Elt ObjPtr VLPtr Value Binding VL * StrSet * CharSet Leaf** Char16 * Char16 Leaf Char32 Cache
x86 78563412_00000008_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_00000020 x86 78563412_00000008_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_00000020
x86-64 78563412_00000008_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000038 x86-64 78563412_00000008_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000038
ppc 12345678_00000008_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_00000010_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_00000020 ppc 12345678_00000008_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_00000010_00000004_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_00000020
ppc64 12345678_00000008_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000038 ppc64 12345678_00000008_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000038
m68k 12345678_00000008_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_00000020 m68k 12345678_00000008_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_00000020
mipsel 78563412_00000008_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_00000010_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_00000020 mipsel 78563412_00000008_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_00000010_00000004_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_00000020
sparc64 12345678_00000008_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000038 sparc64 12345678_00000008_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000038

2
src/fclang.c
View File

@ -39,7 +39,7 @@ typedef struct {
struct _FcLangSet { struct _FcLangSet {
FcStrSet *extra; FcStrSet *extra;
int map_size; FcChar32 map_size;
FcChar32 map[NUM_LANG_SET_MAP]; FcChar32 map[NUM_LANG_SET_MAP];
}; };