From 3e8435783c0112a294588c7ec72fe03559888ed1 Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Thu, 20 Dec 2012 08:45:54 +0000 Subject: [PATCH] More fixes --- Makefile | 2 +- test.c | 1 - util.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a66b811..fe05bf5 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ CYGWIN = $(findstring CYGWIN, $(UNAME)) MINGW = $(findstring MINGW32, $(UNAME)) CC ?= clang -CFLAGS += -Wall -Wextra -I. -pedantic-errors +CFLAGS += -Wall -Wextra -I. -pedantic-errors -std=gnu99 #turn on tons of warnings if clang is present # but also turn off the STUPID ONES ifeq ($(CC), clang) diff --git a/test.c b/test.c index 3ee7451..6ca4fec 100644 --- a/test.c +++ b/test.c @@ -50,7 +50,6 @@ char *task_bins[] = { #ifndef _WIN32 #include #include - #include typedef struct { FILE *handles[3]; diff --git a/util.c b/util.c index c3d3d4f..3961c74 100644 --- a/util.c +++ b/util.c @@ -533,7 +533,7 @@ typedef struct hash_node_t { * below. These should be autovectorized by gcc. */ #ifdef __x86_64__ -GMQCC_INLINE uint32_t util_hthashfunc(hash_table_t *ht, const char *key, register size_t seed) { +static GMQCC_INLINE uint32_t util_hthashfunc(hash_table_t *ht, const char *key, size_t seed) { const uint64_t mix = 0xC6A4A7935BD1E995UL; const int rot = 47; size_t size = strlen(key); @@ -575,7 +575,7 @@ GMQCC_INLINE uint32_t util_hthashfunc(hash_table_t *ht, const char *key, registe } #else -GMQCC_INLINE uint32_t util_hthashfunc(hash_table_t *ht, const char *key, register size_t seed) { +static GMQCC_INLINE uint32_t util_hthashfunc(hash_table_t *ht, const char *key, size_t seed) { const uint32_t mix = 0x5BD1E995; const uint32_t rot = 24; size_t size = strlen(key); -- 2.39.2