From 82c9ccd349f10a551ff6df098e9a136982de6e2b Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Wed, 15 Apr 2009 15:50:06 +0000
Subject: Lose a bunch of trailing commas. GCC 2.95 compatibility.

svn path=/trunk/libparserutils/; revision=7094
---
 Makefile                            | 14 ++++++++++++--
 include/parserutils/charset/codec.h |  4 ++--
 src/input/filter.h                  |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 3606b70..2de8fc8 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,21 @@ include build/makefiles/Makefile.tools
 TESTRUNNER := $(PERL) build/testtools/testrunner.pl
 
 # 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/parserutils/charset/codec.h b/include/parserutils/charset/codec.h
index d79740b..d49c858 100644
--- a/include/parserutils/charset/codec.h
+++ b/include/parserutils/charset/codec.h
@@ -60,7 +60,7 @@ typedef enum parserutils_charset_codec_errormode {
 	/** Replace unrepresentable characters with single alternate */
 	PARSERUTILS_CHARSET_CODEC_ERROR_LOOSE    = 1,
 	/** Transliterate unrepresentable characters, if possible */
-	PARSERUTILS_CHARSET_CODEC_ERROR_TRANSLIT = 2,
+	PARSERUTILS_CHARSET_CODEC_ERROR_TRANSLIT = 2
 } parserutils_charset_codec_errormode;
 
 /**
@@ -68,7 +68,7 @@ typedef enum parserutils_charset_codec_errormode {
  */
 typedef enum parserutils_charset_codec_opttype {
 	/** Set codec error mode */
-	PARSERUTILS_CHARSET_CODEC_ERROR_MODE  = 1,
+	PARSERUTILS_CHARSET_CODEC_ERROR_MODE  = 1
 } parserutils_charset_codec_opttype;
 
 /**
diff --git a/src/input/filter.h b/src/input/filter.h
index 0d72b92..c9f2053 100644
--- a/src/input/filter.h
+++ b/src/input/filter.h
@@ -19,7 +19,7 @@ typedef struct parserutils_filter parserutils_filter;
  * Input filter option types
  */
 typedef enum parserutils_filter_opttype {
-	PARSERUTILS_FILTER_SET_ENCODING       = 0,
+	PARSERUTILS_FILTER_SET_ENCODING       = 0
 } parserutils_filter_opttype;
 
 /**
-- 
cgit v1.2.3