From d66af0ab2044c62d1a1a6b6549907915cc1b1f00 Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Thu, 23 Oct 2003 05:15:39 -0700
Subject: [PATCH] [svn] Don't use trailing commas in enums.

---
 src/ChangeLog    | 9 +++++++++
 src/html-parse.c | 2 +-
 src/url.c        | 2 +-
 src/utils.c      | 8 ++++++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index ede8f4ba..0fca251f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-23  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* url.c: Ditto.
+
+	* html-parse.c (advance_declaration): Don't use trailing comma in
+	enum because older compilers don't support it.
+
+	* utils.c: Don't redefine HAVE_SIGSETJMP.
+
 2003-10-16  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* convert.c (construct_relative): Don't handle absolute files
diff --git a/src/html-parse.c b/src/html-parse.c
index 88aec753..71bc1a93 100644
--- a/src/html-parse.c
+++ b/src/html-parse.c
@@ -462,7 +462,7 @@ advance_declaration (const char *beg, const char *end)
     AC_S_DASH4,
     AC_S_QUOTE1,
     AC_S_IN_QUOTE,
-    AC_S_QUOTE2,
+    AC_S_QUOTE2
   } state = AC_S_BANG;
 
   if (beg == end)
diff --git a/src/url.c b/src/url.c
index 90bfaa70..9f50127c 100644
--- a/src/url.c
+++ b/src/url.c
@@ -1350,7 +1350,7 @@ append_char (char ch, struct growable *dest)
 enum {
   filechr_not_unix    = 1,	/* unusable on Unix, / and \0 */
   filechr_not_windows = 2,	/* unusable on Windows, one of \|/<>?:*" */
-  filechr_control     = 4,	/* a control character, e.g. 0-31 */
+  filechr_control     = 4	/* a control character, e.g. 0-31 */
 };
 
 #define FILE_CHAR_TEST(c, mask) (filechr_table[(unsigned char)(c)] & (mask))
diff --git a/src/utils.c b/src/utils.c
index 85dd5fcd..11c404ae 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -77,10 +77,14 @@ so, delete this exception statement from your version.  */
 #ifdef HAVE_SETJMP_H
 # include <setjmp.h>
 #endif
+
+#ifndef HAVE_SIGSETJMP
 /* If sigsetjmp is a macro, configure won't pick it up. */
-#ifdef sigsetjmp
-# define HAVE_SIGSETJMP
+# ifdef sigsetjmp
+#  define HAVE_SIGSETJMP
+# endif
 #endif
+
 #ifdef HAVE_SIGNAL
 # ifdef HAVE_SIGSETJMP
 #  define USE_SIGNAL_TIMEOUT