[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnulib update
From: |
Gavin D. Smith |
Subject: |
branch master updated: gnulib update |
Date: |
Sun, 23 Oct 2022 12:14:48 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new bcecbc5ae6 gnulib update
bcecbc5ae6 is described below
commit bcecbc5ae659a34ecdba6990c65a15a828d0ca3d
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Oct 23 17:14:41 2022 +0100
gnulib update
---
gnulib/m4/assert_h.m4 | 6 ++++++
tp/Texinfo/XS/gnulib/m4/assert_h.m4 | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/gnulib/m4/assert_h.m4 b/gnulib/m4/assert_h.m4
index c1306daef4..e892ea2f01 100644
--- a/gnulib/m4/assert_h.m4
+++ b/gnulib/m4/assert_h.m4
@@ -57,5 +57,11 @@ AC_DEFUN([gl_ASSERT_H],
&& __GNUG__ < 6 && __clang_major__ < 6)))
#include <assert.h>
#undef/**/assert
+ /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments.
+ We need it also to be invocable with a single argument. */
+ #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus
+ #undef static_assert
+ #define static_assert _Static_assert
+ #endif
#endif])
])
diff --git a/tp/Texinfo/XS/gnulib/m4/assert_h.m4
b/tp/Texinfo/XS/gnulib/m4/assert_h.m4
index c1306daef4..e892ea2f01 100644
--- a/tp/Texinfo/XS/gnulib/m4/assert_h.m4
+++ b/tp/Texinfo/XS/gnulib/m4/assert_h.m4
@@ -57,5 +57,11 @@ AC_DEFUN([gl_ASSERT_H],
&& __GNUG__ < 6 && __clang_major__ < 6)))
#include <assert.h>
#undef/**/assert
+ /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments.
+ We need it also to be invocable with a single argument. */
+ #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus
+ #undef static_assert
+ #define static_assert _Static_assert
+ #endif
#endif])
])