summaryrefslogtreecommitdiff
path: root/gl/stdlib.in.h
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2011-07-14 13:10:45 +0200
committerSimon Josefsson <simon@josefsson.org>2011-07-14 13:10:45 +0200
commit22467f04196c52ebfdf14255748de1b977bff865 (patch)
treedcc3bbeadbe38e3c930a9dcf3246d62f10171b86 /gl/stdlib.in.h
parentc5f7aa11f5fb3095320cfd39903d933e9c27a67b (diff)
downloadlibtasn1-22467f04196c52ebfdf14255748de1b977bff865.tar.gz
libtasn1-22467f04196c52ebfdf14255748de1b977bff865.tar.bz2
libtasn1-22467f04196c52ebfdf14255748de1b977bff865.zip
Update gnulib files.
Diffstat (limited to 'gl/stdlib.in.h')
-rw-r--r--gl/stdlib.in.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/gl/stdlib.in.h b/gl/stdlib.in.h
index 7513553..047fac1 100644
--- a/gl/stdlib.in.h
+++ b/gl/stdlib.in.h
@@ -28,13 +28,13 @@
#else
/* Normal invocation convention. */
-#ifndef _GL_STDLIB_H
+#ifndef _@GUARD_PREFIX@_STDLIB_H
/* The include_next requires a split double-inclusion guard. */
#@INCLUDE_NEXT@ @NEXT_STDLIB_H@
-#ifndef _GL_STDLIB_H
-#define _GL_STDLIB_H
+#ifndef _@GUARD_PREFIX@_STDLIB_H
+#define _@GUARD_PREFIX@_STDLIB_H
/* NetBSD 5.0 mis-defines NULL. */
#include <stddef.h>
@@ -89,11 +89,7 @@ struct random_data
# include <unistd.h>
#endif
-#if 3 <= __GNUC__ || __GNUC__ == 2 && 8 <= __GNUC_MINOR__
-# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
-#else
-# define _GL_ATTRIBUTE_NORETURN
-#endif
+/* The definition of _Noreturn is copied here. */
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
@@ -120,7 +116,7 @@ struct random_data
/* Terminate the current process with the given return code, without running
the 'atexit' handlers. */
# if !@HAVE__EXIT@
-_GL_FUNCDECL_SYS (_Exit, void, (int status) _GL_ATTRIBUTE_NORETURN);
+_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
# endif
_GL_CXXALIAS_SYS (_Exit, void, (int status));
_GL_CXXALIASWARN (_Exit);
@@ -761,6 +757,6 @@ _GL_CXXALIASWARN (wctomb);
#endif
-#endif /* _GL_STDLIB_H */
-#endif /* _GL_STDLIB_H */
+#endif /* _@GUARD_PREFIX@_STDLIB_H */
+#endif /* _@GUARD_PREFIX@_STDLIB_H */
#endif