[Fontconfig] [PATCH] Use uintptr_t in fc-lang for values that may exceed 0x7fffffff
Alan Coopersmith
alan.coopersmith at oracle.com
Wed Jun 2 17:24:31 PDT 2010
Clears a ton of warnings when compiling with the Sun compilers of the form:
"../fc-lang/fclang.h", line 2728: warning: initializer does not fit or is out of range: 0xffffb4b0
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
fc-lang/fc-lang.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fc-lang/fc-lang.c b/fc-lang/fc-lang.c
index 21d568d..c01fe68 100644
--- a/fc-lang/fc-lang.c
+++ b/fc-lang/fc-lang.c
@@ -363,9 +363,9 @@ main (int argc, char **argv)
printf ("#define LEAF0 (%d * sizeof (FcLangCharSet))\n", nsets);
printf ("#define OFF0 (LEAF0 + %d * sizeof (FcCharLeaf))\n", tl);
- printf ("#define NUM0 (OFF0 + %d * sizeof (intptr_t))\n", tn);
+ printf ("#define NUM0 (OFF0 + %d * sizeof (uintptr_t))\n", tn);
printf ("#define SET(n) (n * sizeof (FcLangCharSet) + offsetof (FcLangCharSet, charset))\n");
- printf ("#define OFF(s,o) (OFF0 + o * sizeof (intptr_t) - SET(s))\n");
+ printf ("#define OFF(s,o) (OFF0 + o * sizeof (uintptr_t) - SET(s))\n");
printf ("#define NUM(s,n) (NUM0 + n * sizeof (FcChar16) - SET(s))\n");
printf ("#define LEAF(o,l) (LEAF0 + l * sizeof (FcCharLeaf) - (OFF0 + o * sizeof (intptr_t)))\n");
printf ("#define fcLangCharSets (fcLangData.langCharSets)\n");
@@ -376,7 +376,7 @@ main (int argc, char **argv)
printf ("static const struct {\n"
" FcLangCharSet langCharSets[%d];\n"
" FcCharLeaf leaves[%d];\n"
- " intptr_t leaf_offsets[%d];\n"
+ " uintptr_t leaf_offsets[%d];\n"
" FcChar16 numbers[%d];\n"
" FcChar%s langIndices[%d];\n"
" FcChar%s langIndicesInv[%d];\n"
--
1.5.6.5
More information about the Fontconfig
mailing list