From: Bruno Haible <bruno@clisp.org>
Date: Fri, 11 Apr 2008 23:34:34 +0000 (+0200)
Subject: Fix two compilation errors.
X-Git-Tag: v0.1~7577
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=829d0e0cfc21f3eb72ff83d70b7aabc5c9854a17;p=gnulib.git

Fix two compilation errors.
---

diff --git a/ChangeLog b/ChangeLog
index a7fb68325..92f808023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-04-11  Bruno Haible  <bruno@clisp.org>
 
+	* lib/strsignal.c (_sys_siglist): Don't declare if already declared.
+	(init): Fix syntax error.
+	* m4/strsignal.m4 (gl_PREREQ_STRSIGNAL): Check whether _sys_siglist
+	is declared.
+
+2008-04-11  Bruno Haible  <bruno@clisp.org>
+
 	* lib/glob.c: Include <stdbool.h>. Needed at least with IRIX cc.
 	* modules/glob (Depends-on): Add stdbool.
 
diff --git a/lib/strsignal.c b/lib/strsignal.c
index 2496e2ca4..2e76bb896 100644
--- a/lib/strsignal.c
+++ b/lib/strsignal.c
@@ -66,7 +66,9 @@ extern const char *const _sys_siglist_internal[] attribute_hidden;
 #  ifndef NSIG
 #   define NSIG 32
 #  endif /* NSIG */
+#  if !HAVE_DECL__SYS_SIGLIST
 static const char *_sys_siglist[NSIG];
+#  endif
 # endif /* !HAVE_DECL_SYS_SIGLIST */
 
 #endif /* _LIBC */
@@ -147,7 +149,6 @@ init (void)
 #  define init_sig(sig, abbrev, desc) \
   if (sig >= 0 && sig < NSIG) \
     _sys_siglist[sig] = desc;
-} while (0);
 
 #  include "siglist.h"
 
diff --git a/m4/strsignal.m4 b/m4/strsignal.m4
index 5244dcb6c..d71f0963f 100644
--- a/m4/strsignal.m4
+++ b/m4/strsignal.m4
@@ -1,4 +1,4 @@
-# strsignal.m4 serial 2
+# strsignal.m4 serial 3
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -51,5 +51,5 @@ AC_DEFUN([gl_FUNC_STRSIGNAL],
 # Prerequisites of lib/strsignal.c.
 AC_DEFUN([gl_PREREQ_STRSIGNAL], [
   AC_REQUIRE([AC_DECL_SYS_SIGLIST])
-  :
+  AC_CHECK_DECLS([_sys_siglist], [], [], [#include <signal.h>])
 ])