X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrsignal.c;h=a7adaba956037635326ee4c383619ce51fc820b7;hb=04606dd55fd8f1a122a21c4b4e09ab2a36498385;hp=2496e2ca445c404b86377483ae233479aa4f5f74;hpb=bd642010ddd06b7ced7e5a26a75c68fd828ac2bf;p=gnulib.git

diff --git a/lib/strsignal.c b/lib/strsignal.c
index 2496e2ca4..a7adaba95 100644
--- a/lib/strsignal.c
+++ b/lib/strsignal.c
@@ -36,8 +36,8 @@
 #ifdef _LIBC
 # include <bits/libc-lock.h>
 #else /* !_LIBC */
-# include "lock.h"
-# include "tls.h"
+# include "glthread/lock.h"
+# include "glthread/tls.h"
 # define __libc_once_define(CLASS, NAME) gl_once_define (CLASS, NAME)
 # define __libc_once(NAME, INIT) gl_once ((NAME), (INIT))
 # define __libc_key_t gl_tls_key_t
@@ -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"