From 103bca7284dfee62c62c670fd1be9b7929581c5e Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Sat, 14 Dec 2013 14:57:10 -0500 Subject: [PATCH] Partially fix that. --- BSDmakefile | 2 +- Makefile | 2 +- hash.c | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/BSDmakefile b/BSDmakefile index 812df35..4938541 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -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\ diff --git a/Makefile b/Makefile index 97f16c9..3097368 100644 --- 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 769f445..5043962 100644 --- a/hash.c +++ b/hash.c @@ -68,11 +68,6 @@ * 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 -- 2.39.2