summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2013-01-02 17:52:00 -0600
committerBehdad Esfahbod <behdad@behdad.org>2013-01-02 18:00:09 -0600
commit46ab96b8fa029fbc8ccf69a6f2fda89866e3ac9c (patch)
tree137ce207b036bbebe0102edbd8c64a2081e1216c
parent558b3c65f91b4b2dd65ce2242e1a21ace621e44b (diff)
Fix more warnings.
Linux build and mingw32 cross build warning-free now.
-rw-r--r--src/fcobjs.c10
-rw-r--r--src/fcobjshash.gperf.h2
2 files changed, 9 insertions, 3 deletions
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