* m4/include_next.m4 (gl_INCLUDE_NEXT): Define and AC_SUBST

[gnulib.git] / lib / signal_.h

diff --git a/lib/signal_.h b/lib/signal_.h
index 3dc743d..b62d7a7 100644 (file)
--- a/lib/signal_.h
+++ b/lib/signal_.h
@@ -19,23 +19,18 @@
 #if defined __need_sig_atomic_t || defined __need_sigset_t
 /* Special invocation convention inside glibc header files.  */
 
-# if @HAVE_INCLUDE_NEXT@
-#  include_next <signal.h>
-# else
-#  include @ABSOLUTE_SIGNAL_H@
-# endif
+# @INCLUDE_NEXT@ @NEXT_SIGNAL_H@
 
 #else
 /* Normal invocation convention.  */
 
 #ifndef _GL_SIGNAL_H
-#define _GL_SIGNAL_H
 
-#if @HAVE_INCLUDE_NEXT@
-# include_next <signal.h>
-#else
-# include @ABSOLUTE_SIGNAL_H@
-#endif
+/* The include_next requires a split double-inclusion guard.  */
+#@INCLUDE_NEXT@ @NEXT_SIGNAL_H@
+
+#ifndef _GL_SIGNAL_H
+#define _GL_SIGNAL_H
 
 /* The definition of GL_LINK_WARNING is copied here.  */
 
@@ -99,4 +94,5 @@ extern int sigprocmask (int operation, const sigset_t *set, sigset_t *old_set);
 #endif
 
 #endif /* _GL_SIGNAL_H */
+#endif /* _GL_SIGNAL_H */
 #endif