summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-04-15 16:01:48 (GMT)
committer John Mark Bell <jmb@netsurf-browser.org>2009-04-15 16:01:48 (GMT)
commit870d2f9e26e8def4600af63a54f7d3d3c180406f (patch)
tree44cdd302a1bca9d818d9f5a965c0b81e7950fda5
parent63d8c28947f80a3e6dd0eb107cdb38fba71dd771 (diff)
downloadlibwapcaplet-870d2f9e26e8def4600af63a54f7d3d3c180406f.tar.gz
libwapcaplet-870d2f9e26e8def4600af63a54f7d3d3c180406f.tar.bz2
Lose trailing comma.
GCC 2.95 compatibility. svn path=/trunk/libwapcaplet/; revision=7098
-rw-r--r--Makefile13
-rw-r--r--include/libwapcaplet/libwapcaplet.h2
2 files changed, 12 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3169b21..dde927c 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,20 @@ include build/makefiles/Makefile.tools
TESTRUNNER = $(BUILDDIR)/test_testrunner$(EXEEXT)
# Toolchain flags
-WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
+WARNFLAGS := -Wall -Wundef -Wpointer-arith -Wcast-align \
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -Werror -pedantic
-CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -I$(CURDIR)/include/ \
+ifneq ($(GCCVER),2)
+ WARNFLAGS := $(WARNFLAGS) -Wextra
+endif
+CFLAGS := $(CFLAGS) -D_BSD_SOURCE -I$(CURDIR)/include/ \
-I$(CURDIR)/src $(WARNFLAGS)
+ifneq ($(GCCVER),2)
+ CFLAGS := $(CFLAGS) -std=c99
+else
+ # __inline__ is a GCCism
+ CFLAGS := $(CFLAGS) -Dinline="__inline__"
+endif
include build/makefiles/Makefile.top
diff --git a/include/libwapcaplet/libwapcaplet.h b/include/libwapcaplet/libwapcaplet.h
index c3b99ea..919d1e1 100644
--- a/include/libwapcaplet/libwapcaplet.h
+++ b/include/libwapcaplet/libwapcaplet.h
@@ -33,7 +33,7 @@ typedef struct lwc_string_s lwc_string;
typedef enum lwc_error_e {
lwc_error_ok = 0,
lwc_error_oom = 1,
- lwc_error_range = 2,
+ lwc_error_range = 2
} lwc_error;
/**