]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Partially fix that.
authorDale Weiler <killfieldengine@gmail.com>
Sat, 14 Dec 2013 19:57:10 +0000 (14:57 -0500)
committerDale Weiler <killfieldengine@gmail.com>
Sat, 14 Dec 2013 19:57:10 +0000 (14:57 -0500)
BSDmakefile
Makefile
hash.c

index 812df35e118cbb690d60292f922ada28d15df462..49385413b3e126023284533bb66adc0940c8e71a 100644 (file)
@@ -11,7 +11,7 @@ GITINFO  :=
     GITINFO != git describe --always
 .endif
 
-CFLAGS   +=  -Wall -Wextra -Werror -Wstrict-aliasing
+CFLAGS   +=  -Wall -Wextra -Werror -Wstrict-aliasing -Wno-attributes
 
 .if $(CC) == clang
     CFLAGS +=   -Weverything\
index 97f16c99dd61e3e8c22c608926a4175a341286a0..3097368802bca32cf61b1835241ca93bb2d5cbad 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ UNAME  ?= $(shell uname)
 CYGWIN  = $(findstring CYGWIN,  $(UNAME))
 MINGW   = $(findstring MINGW32, $(UNAME))
 
-CFLAGS += -Wall -Wextra -Werror -Wstrict-aliasing
+CFLAGS += -Wall -Wextra -Werror -Wstrict-aliasing -Wno-attributes
 #turn on tons of warnings if clang is present
 # but also turn off the STUPID ONES
 ifeq ($(CC), clang)
diff --git a/hash.c b/hash.c
index 769f44565eb340458c56ea38a94cf19c39576b94..5043962974290a9054dd69604e416f3bc87beacc 100644 (file)
--- a/hash.c
+++ b/hash.c
  * Murmur3 comes in to save the day.
  */
 
-#ifdef __GNUC__
-#   pragma GCC diagnostic push
-#   pragma GCC diagnostic ignored "-Wattributes"
-#endif
-
 /*
  * Some rotation tricks:
  *  MSVC one shaves off six instructions, where GCC optimized one for
@@ -454,7 +449,3 @@ size_t hash(const char *key) {
 #undef HASH_NATIVE_BLOCK
 #undef HASH_NATIVE_BYTES
 #undef HASH_NATIVE_SAFEREAD
-
-#ifdef __GNUC__
-#   pragma GCC diagnostic pop
-#endif