From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 2 Jan 2013 23:52:00 +0000 (-0600)
Subject: Fix more warnings.
X-Git-Tag: 2.10.91~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=46ab96b8fa029fbc8ccf69a6f2fda89866e3ac9c;p=platform%2Fupstream%2Ffontconfig.git

Fix more warnings.

Linux build and mingw32 cross build warning-free now.
---

diff --git a/src/fcobjs.c b/src/fcobjs.c
index b3bb200..1aa4a77 100644
--- a/src/fcobjs.c
+++ b/src/fcobjs.c
@@ -24,15 +24,21 @@
 
 #include "fcint.h"
 
+static unsigned int
+FcObjectTypeHash (register const char *str, register unsigned int len);
+
+static const struct FcObjectTypeInfo *
+FcObjectTypeLookup (register const char *str, register unsigned int len);
+
 #include "fcobjshash.h"
 
 #include <string.h>
 
-static int next_id = FC_MAX_BASE_OBJECT + 1;
+static fc_atomic_int_t next_id = FC_MAX_BASE_OBJECT + 1;
 struct FcObjectOtherTypeInfo {
     struct FcObjectOtherTypeInfo *next;
     FcObjectType object;
-    int id;
+    FcObject id;
 } *other_types;
 
 static FcObjectType *
diff --git a/src/fcobjshash.gperf.h b/src/fcobjshash.gperf.h
index 94002b1..dafac1b 100644
--- a/src/fcobjshash.gperf.h
+++ b/src/fcobjshash.gperf.h
@@ -4,7 +4,7 @@ CUT_OUT_BEGIN
 CUT_OUT_END
 %}
 %struct-type
-%language=C
+%language=ANSI-C
 %includes
 %enum
 %readonly-tables