From a02992dff0463ce82777c7b8ba510840a45ef3c5 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 5 Jun 2026 21:57:33 +0300 Subject: [PATCH 34/34] gnulib-common.m4: Update to serial 122 See RM #2044 Signed-off-by: Marko Lindqvist --- dependencies/m4/gnulib-common.m4 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dependencies/m4/gnulib-common.m4 b/dependencies/m4/gnulib-common.m4 index 5a804d5b4d..12b0836e2a 100644 --- a/dependencies/m4/gnulib-common.m4 +++ b/dependencies/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ # gnulib-common.m4 -# serial 118 +# serial 122 dnl Copyright (C) 2007-2026 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -1279,9 +1279,12 @@ AC_DEFUN([AC_C_RESTRICT], ]) AH_VERBATIM([restrict], [/* Define to the equivalent of the C99 'restrict' keyword, or to - nothing if this is not supported. Do not define if restrict is - supported directly. */ -#if ! (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__) + nothing if this is not supported. In particular it is not supported + in MSVC 14.44 and in g++ 7 on Solaris 11, although these compilers + define __STDC_VERSION__ to 199901L. + Do not define if restrict is supported directly. */ +#if ! (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__ \ + && !defined _MSC_VER && !defined __cplusplus) #undef restrict #endif /* Work around a bug in older versions of Sun C++, which did not -- 2.53.0