From 469b0d23f2533aff2c5f898ff557091948156d39 Mon Sep 17 00:00:00 2001 From: Paul Eggert <eggert@cs.ucla.edu> Date: Sun, 16 Apr 2017 12:43:20 -0700 Subject: [PATCH] regex: port better to Solaris 10 Solaris 10 <locale.h> includes <libintl.h>, which #defines gettext, and this causes a double #define. Problem reported by Gavin Smith in: http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00056.html * lib/regex_internal.h (gettext): #undef before #defining. --- ChangeLog | 9 +++++++++ lib/regex_internal.h | 1 + 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index b19910b985..f57c3761ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2017-04-16 Paul Eggert <eggert@cs.ucla.edu> + + regex: port better to Solaris 10 + Solaris 10 <locale.h> includes <libintl.h>, which #defines + gettext, and this causes a double #define. + Problem reported by Gavin Smith in: + http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00056.html + * lib/regex_internal.h (gettext): #undef before #defining. + 2017-04-15 Paul Eggert <eggert@Penguin.CS.UCLA.EDU> intprops: improve comments diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 9bb074056f..827020719c 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -102,6 +102,7 @@ __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES) # endif #else +# undef gettext # define gettext(msgid) (msgid) #endif -- 2.39.5