r7098 jmb - in /trunk/libwapcaplet: Makefile include/libwapcaplet/libwapcaplet.h

[netsurf at semichrome.net]

Author: jmb
Date: Wed Apr 15 11:01:48 2009
New Revision: 7098

URL: http://source.netsurf-browser.org?rev=7098&view=rev
Log:
Lose trailing comma.
GCC 2.95 compatibility.

Modified:
    trunk/libwapcaplet/Makefile
    trunk/libwapcaplet/include/libwapcaplet/libwapcaplet.h

Modified: trunk/libwapcaplet/Makefile
URL: http://source.netsurf-browser.org/trunk/libwapcaplet/Makefile?rev=7098&r1=7097&r2=7098&view=diff
==============================================================================
--- trunk/libwapcaplet/Makefile (original)
+++ trunk/libwapcaplet/Makefile Wed Apr 15 11:01:48 2009
@@ -11,11 +11,20 @@
 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
 

Modified: trunk/libwapcaplet/include/libwapcaplet/libwapcaplet.h
URL: http://source.netsurf-browser.org/trunk/libwapcaplet/include/libwapcaplet/libwapcaplet.h?rev=7098&r1=7097&r2=7098&view=diff
==============================================================================
--- trunk/libwapcaplet/include/libwapcaplet/libwapcaplet.h (original)
+++ trunk/libwapcaplet/include/libwapcaplet/libwapcaplet.h Wed Apr 15 11:01:48 2009
@@ -33,7 +33,7 @@
 typedef enum lwc_error_e {
 	lwc_error_ok		= 0,
 	lwc_error_oom		= 1,
-        lwc_error_range		= 2,
+        lwc_error_range		= 2
 } lwc_error;
 
 /**