From 8f025108a574602e50d1090204ba30cf68047f54 Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Wed, 15 Apr 2009 15:55:34 +0000
Subject: Lose trailing commas. GCC 2.95 compatibility.

svn path=/trunk/hubbub/; revision=7095
---
 Makefile                      | 13 +++++++++++--
 include/hubbub/parser.h       |  2 +-
 include/hubbub/types.h        |  2 +-
 src/treebuilder/internal.h    |  2 +-
 src/treebuilder/modes.h       |  2 +-
 src/treebuilder/treebuilder.h |  2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 980f77e..37f5d70 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,20 @@ 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
 
 # Parserutils
 ifneq ($(PKGCONFIG),)
diff --git a/include/hubbub/parser.h b/include/hubbub/parser.h
index 6ded8bf..e1e504c 100644
--- a/include/hubbub/parser.h
+++ b/include/hubbub/parser.h
@@ -27,7 +27,7 @@ typedef enum hubbub_parser_opttype {
 	HUBBUB_PARSER_CONTENT_MODEL,
 	HUBBUB_PARSER_TREE_HANDLER,
 	HUBBUB_PARSER_DOCUMENT_NODE,
-	HUBBUB_PARSER_ENABLE_SCRIPTING,
+	HUBBUB_PARSER_ENABLE_SCRIPTING
 } hubbub_parser_opttype;
 
 /**
diff --git a/include/hubbub/types.h b/include/hubbub/types.h
index b2f3670..66eca39 100644
--- a/include/hubbub/types.h
+++ b/include/hubbub/types.h
@@ -18,7 +18,7 @@ typedef enum hubbub_charset_source {
 	HUBBUB_CHARSET_UNKNOWN		= 0,	/**< Unknown */
 	HUBBUB_CHARSET_TENTATIVE	= 1,	/**< Charset may be changed
 						 * with further data */
-	HUBBUB_CHARSET_CONFIDENT	= 2,	/**< Charset definite */
+	HUBBUB_CHARSET_CONFIDENT	= 2	/**< Charset definite */
 } hubbub_charset_source;
 
 /**
diff --git a/src/treebuilder/internal.h b/src/treebuilder/internal.h
index 72fe8b7..bc2fb9d 100644
--- a/src/treebuilder/internal.h
+++ b/src/treebuilder/internal.h
@@ -33,7 +33,7 @@ typedef enum
 /* SVG */
 	SVG, FOREIGNOBJECT, /* foreignobject is scoping, but only in SVG ns */
 	DESC,
-	UNKNOWN,
+	UNKNOWN
 } element_type;
 
 /**
diff --git a/src/treebuilder/modes.h b/src/treebuilder/modes.h
index 2c9f546..411e7a6 100644
--- a/src/treebuilder/modes.h
+++ b/src/treebuilder/modes.h
@@ -35,7 +35,7 @@ typedef enum
 	AFTER_AFTER_BODY,
 	AFTER_AFTER_FRAMESET,
 
-	GENERIC_RCDATA,
+	GENERIC_RCDATA
 } insertion_mode;
 
 
diff --git a/src/treebuilder/treebuilder.h b/src/treebuilder/treebuilder.h
index ab87cea..2ff1c38 100644
--- a/src/treebuilder/treebuilder.h
+++ b/src/treebuilder/treebuilder.h
@@ -27,7 +27,7 @@ typedef enum hubbub_treebuilder_opttype {
 	HUBBUB_TREEBUILDER_ERROR_HANDLER,
 	HUBBUB_TREEBUILDER_TREE_HANDLER,
 	HUBBUB_TREEBUILDER_DOCUMENT_NODE,
-	HUBBUB_TREEBUILDER_ENABLE_SCRIPTING,
+	HUBBUB_TREEBUILDER_ENABLE_SCRIPTING
 } hubbub_treebuilder_opttype;
 
 /**
-- 
cgit v1.2.3