Fix two compilation errors.

diff --git a/ChangeLog b/ChangeLog
index a7fb68325e50072e1649284daf0a2a123035239e..92f8080234749d02c478434eed7815dda2be1967 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/lib/strsignal.c b/lib/strsignal.c
index 2496e2ca445c404b86377483ae233479aa4f5f74..2e76bb8969133d9332d08bcd89cb76a80c415d20 100644 (file)
--- 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 5244dcb6c126e12262234b63f43c85a550a55404..d71f0963fb6d99802f04df88eb17044360601f48 100644 (file)
--- 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>])
 ])