summaryrefslogtreecommitdiff
path: root/lib/glm4
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2012-05-31 16:36:44 +0200
committerSimon Josefsson <simon@josefsson.org>2012-05-31 16:36:44 +0200
commitc9c211a91572481e554bf2d06a2120adccfe16a3 (patch)
tree2e4efde250df40809865cfe1828e727585a36cda /lib/glm4
parent0dd5f96848dc1b5b4357f9afade87fa05a3f79e5 (diff)
downloadlibtasn1-c9c211a91572481e554bf2d06a2120adccfe16a3.tar.gz
libtasn1-c9c211a91572481e554bf2d06a2120adccfe16a3.tar.bz2
libtasn1-c9c211a91572481e554bf2d06a2120adccfe16a3.zip
Update gnulib files.
Diffstat (limited to 'lib/glm4')
-rw-r--r--lib/glm4/gnulib-common.m43
-rw-r--r--lib/glm4/warn-on-use.m46
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/glm4/gnulib-common.m4 b/lib/glm4/gnulib-common.m4
index ae4d254..d62b767 100644
--- a/lib/glm4/gnulib-common.m4
+++ b/lib/glm4/gnulib-common.m4
@@ -14,7 +14,8 @@ AC_DEFUN([gl_COMMON], [
AC_DEFUN([gl_COMMON_BODY], [
AH_VERBATIM([_Noreturn],
[/* The _Noreturn keyword of C11. */
-#ifndef _Noreturn
+#if ! (defined _Noreturn \
+ || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
|| 0x5110 <= __SUNPRO_C)
# define _Noreturn __attribute__ ((__noreturn__))
diff --git a/lib/glm4/warn-on-use.m4 b/lib/glm4/warn-on-use.m4
index 03b113c..a77802e 100644
--- a/lib/glm4/warn-on-use.m4
+++ b/lib/glm4/warn-on-use.m4
@@ -1,4 +1,4 @@
-# warn-on-use.m4 serial 4
+# warn-on-use.m4 serial 5
dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -18,8 +18,8 @@ dnl with or without modifications, as long as this notice is preserved.
# some systems declare functions in the wrong header, then INCLUDES
# should do likewise.
#
-# If you assume C89, then it is generally safe to assume declarations
-# for functions declared in that standard (such as gets) without
+# It is generally safe to assume declarations for functions declared
+# in the intersection of C89 and C11 (such as printf) without
# needing gl_WARN_ON_USE_PREPARE.
AC_DEFUN([gl_WARN_ON_USE_PREPARE],
[