regex: port better to Solaris 10
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 16 Apr 2017 19:43:20 +0000 (12:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 16 Apr 2017 19:43:49 +0000 (12:43 -0700)
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
lib/regex_internal.h

index b19910b985f88d9f4274ebb7575aa782ec98ca76..f57c3761ea4cc53feb4ded3d13d17ac1c312dc25 100644 (file)
--- 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
index 9bb074056f44112695e917f9dd0021b670c7d380..827020719c5bd5b98789427c88e64d16294cd606 100644 (file)
   __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
 # endif
 #else
+# undef gettext
 # define gettext(msgid) (msgid)
 #endif