diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-09-08 21:42:19 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-09-08 21:42:19 +0300 |
| commit | ff1c6aa3df9fb3432d3cdcc61be7fa2fdc1d517e (patch) | |
| tree | 6d1fd586f141a44db08afe29675564da5daeef89 | |
| parent | bd270ca4676197614da0d7b5d793c9c8b7cd333b (diff) | |
| parent | 81f53c08b12ba4150e02a2dcb647d8176570fca1 (diff) | |
| download | egawk-ff1c6aa3df9fb3432d3cdcc61be7fa2fdc1d517e.tar.gz egawk-ff1c6aa3df9fb3432d3cdcc61be7fa2fdc1d517e.tar.bz2 egawk-ff1c6aa3df9fb3432d3cdcc61be7fa2fdc1d517e.zip | |
Merge branch 'gawk-4.2-stable'
| -rw-r--r-- | pc/ChangeLog | 5 | ||||
| -rw-r--r-- | pc/config.h | 4 | ||||
| -rw-r--r-- | pc/config.sed | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/pc/ChangeLog b/pc/ChangeLog index 834aede5..f28257ea 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,8 @@ +2018-09-08 Eli Zaretskii <eliz@gnu.org> + + * config.sed (_GNU_SOURCE) [__MINGW32__]: Define to 1. + * config.h: Regenerate. + 2018-08-04 Eli Zaretskii <eliz@gnu.org> * gawkmisc.pc (nl_langinfo) [__MINGW32__]: New function diff --git a/pc/config.h b/pc/config.h index 103c6caf..6ebf5975 100644 --- a/pc/config.h +++ b/pc/config.h @@ -510,6 +510,10 @@ /* force use of our version of strftime */ #undef USE_INCLUDED_STRFTIME +/* This is required to compile Gnulib regex code. */ +#ifdef __MINGW32__ +#define _GNU_SOURCE 1 +#endif /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE diff --git a/pc/config.sed b/pc/config.sed index 75ad0890..840feab6 100644 --- a/pc/config.sed +++ b/pc/config.sed @@ -299,6 +299,12 @@ s/^#undef TIME_WITH_SYS_TIME *$/#define TIME_WITH_SYS_TIME 1/ #define inline __inline__\ #endif +/^\/\* Enable extensions on AIX 3, Interix. \*\//i\ +/* This is required to compile Gnulib regex code. */\ +#ifdef __MINGW32__\ +#define _GNU_SOURCE 1\ +#endif + s|^#undef PACKAGE_URL *$|#define PACKAGE_URL "http://www.gnu.org/software/gawk/"| $a\ |