From 7fbedd8f54dc0f8b7dbd940760333520bc92e32f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 13 Dec 2020 17:32:34 -0800 Subject: [PATCH 5/5] string: port memchr macro to AIX 7.2 XLC Its defines a memchr macro to help inlining. * lib/string.in.h (memchr): #undef before #defining. --- ChangeLog | 4 ++++ lib/string.in.h | 1 + 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index b8213ada0..9f9a02160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2020-12-13 Paul Eggert + string: port memchr macro to AIX 7.2 XLC + Its defines a memchr macro to help inlining. + * lib/string.in.h (memchr): #undef before #defining. + canonicalize: fix AIX test failures Problem reported by Bruno Haible in: https://lists.gnu.org/r/bug-gnulib/2020-12/msg00109.html diff --git a/lib/string.in.h b/lib/string.in.h index 1bda0fc56..5c3667e8f 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -144,6 +144,7 @@ _GL_CXXALIASWARN (memccpy); #if @GNULIB_MEMCHR@ # if @REPLACE_MEMCHR@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef memchr # define memchr rpl_memchr # endif _GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n) -- 2.27.0