From 7e27a501babb812af0ab8f46515f1870b4fe1f05 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 18 Jun 2014 01:08:50 +0200 Subject: gcc specific flags and use of wrong parameter name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 10 ++++------ src/lib/libgamma-facade.c.gpp | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a9904bf..14bb7ad 100644 --- a/Makefile +++ b/Makefile @@ -42,14 +42,14 @@ WARN = -Wall -Wextra -pedantic -Wformat=2 -Winit-self -Wmissing-include-dirs \ -Wswitch-default -Wconversion -Wunsafe-loop-optimizations -Wcast-align \ -Wstrict-overflow -Wdeclaration-after-statement -Wundef -Wcast-qual \ -Wbad-function-cast -Wwrite-strings -Waggregate-return -Wpacked \ - -Wstrict-prototypes -Wold-style-definition -Wnormalized=nfkc + -Wstrict-prototypes -Wold-style-definition ifeq ($(CC),gcc) WARN += -Wdouble-promotion -Wtrampolines -Wsign-conversion -Wsync-nand \ -Wlogical-op -Wvector-operation-performance \ -Wunsuffixed-float-constants -Wsuggest-attribute=const \ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ - -Wsuggest-attribute=format + -Wsuggest-attribute=format -Wnormalized=nfkc endif @@ -104,11 +104,10 @@ endif # Options for the C compiler for the test. TEST_FLAGS = $(OPTIMISE) $(WARN) -std=$(STD) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \ - -ftree-vrp -fstrict-aliasing -fipa-pure-const -fstrict-overflow \ - -funsafe-loop-optimizations -fno-builtin + -fstrict-aliasing -fstrict-overflow -fno-builtin ifeq ($(CC),gcc) -TEST_FLAGS += -fstack-usage +TEST_FLAGS += -fstack-usage -ftree-vrp -fipa-pure-const -funsafe-loop-optimizations endif @@ -116,7 +115,6 @@ endif LIB_FLAGS = $(TEST_FLAGS) $(DEBUG_FLAGS) $(DEFINITIONS) -DLIBGAMMA_CONFIG_H - # Build rules. .PHONY: default diff --git a/src/lib/libgamma-facade.c.gpp b/src/lib/libgamma-facade.c.gpp index 5343dcc..5e913ea 100644 --- a/src/lib/libgamma-facade.c.gpp +++ b/src/lib/libgamma-facade.c.gpp @@ -202,7 +202,7 @@ $>done int libgamma_is_method_available(int method) { #ifdef HAVE_NO_LIBGAMMA_METHODS - (void) methods; + (void) method; return 0; #else switch (method) -- cgit v1.2.3-70-g09d2