[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-2768-ga55602a

[Eli Zaretskii]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  a55602ac6f4fc9c2a023129230802c2fcad1cb27 (commit)
      from  ba99a7807e7f245e39a1f3139f25ecdea8fd88ff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=a55602ac6f4fc9c2a023129230802c2fcad1cb27

commit a55602ac6f4fc9c2a023129230802c2fcad1cb27
Author: Eli Zaretskii <address@hidden>
Date:   Sat Sep 16 14:06:23 2017 +0300

    Update the MinGW build to recent changes.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 9ed997b..cd4203c 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,17 @@
+2017-09-16  Eli Zaretskii  <address@hidden>
+
+       * config.h (HAVE_GAI_STRERROR) [__MINGW32__]: Define to 1.  Update
+       to Gawk 4.1.64.
+
+       * config.sed (HAVE_GAI_STRERROR) [__MINGW32__]: Edit to 1 for MinGW.
+
+       * Makefile.tst (nondec): Edit the error message to match teh
+       expected results.
+
+       * Makefile (awkgram.c): Edit "parse error" into "syntax error",
+       like the mainline Makefile does.
+       (clean): Remove awkgram.tmp.
+
 2017-08-27         Juan Manuel Guerrero  <address@hidden>
 
        * pc/Makefile.tst (mbstr1, mbstr2, errno, getlndir, clos1way2)
diff --git a/pc/Makefile b/pc/Makefile
index f91e974..f45782d 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -278,7 +278,8 @@ awkgram$O: awk.h awkgram.c
        $(CC) -c $(CFLAGS) awkgram.c
 
 awkgram.c:     awkgram.y
-       bison -o $@ awkgram.y
+       bison -o awkgram.tmp awkgram.y
+       sed "s/parse error/syntax error/g" < awkgram.tmp > $@
 
 alloca$O:      alloca.c
 
@@ -312,7 +313,7 @@ install-strip: install$(install)
        -$(MAKE) -C extension $@
 
 clean:
-       -rm -rf gawk *.exe gawk.map *.o *.obj core a.out $(RSPFILE) $(PRSPFILE) 
$(DRSPFILE) $(DYN_EXP)
+       -rm -rf gawk *.exe gawk.map *.o *.obj core a.out $(RSPFILE) $(PRSPFILE) 
$(DRSPFILE) $(DYN_EXP) awkgram.tmp
 #      cd doc && $(MAKE) clean
 #      cd test && $(MAKE) clean
 #      cd awklib && $(MAKE) clean
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 069431b..a842981 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -2799,7 +2799,7 @@ nondec:
 
 nonfatal1:
        @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden 2>&1 | $(AWK) '{print 
gensub(/invalid.*$$/, "invalid", 1, $$0)}' >_$@ || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 nonfatal2:
diff --git a/pc/config.h b/pc/config.h
index 21497f0..e6b3345 100644
--- a/pc/config.h
+++ b/pc/config.h
@@ -56,6 +56,11 @@
 /* Define to 1 if you have the `fwrite_unlocked' function. */
 #undef HAVE_FWRITE_UNLOCKED
 
+/* Define to 1 if you have the `gai_strerror' function. */
+#ifdef __MINGW32__
+#define HAVE_GAI_STRERROR 1
+#endif
+
 /* have getaddrinfo */
 #ifdef __MINGW32__
 #define HAVE_GETADDRINFO 1
@@ -457,7 +462,7 @@
 #define PACKAGE_NAME "GNU Awk"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU Awk 4.1.63"
+#define PACKAGE_STRING "GNU Awk 4.1.64"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gawk"
@@ -466,7 +471,7 @@
 #define PACKAGE_URL "http://www.gnu.org/software/gawk/";
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.63"
+#define PACKAGE_VERSION "4.1.64"
 
 /* Define to 1 if *printf supports %F format */
 #ifdef __DJGPP__
@@ -523,7 +528,7 @@
 
 
 /* Version number of package */
-#define VERSION "4.1.63"
+#define VERSION "4.1.64"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE
diff --git a/pc/config.sed b/pc/config.sed
index 6498c07..5b3cc32 100644
--- a/pc/config.sed
+++ b/pc/config.sed
@@ -46,6 +46,10 @@ s/^#undef HAVE_ATEXIT *$/#define HAVE_ATEXIT 1/
 #endif
 s/^#undef HAVE_FCNTL_H *$/#define HAVE_FCNTL_H 1/
 s/^#undef HAVE_FMOD *$/#define HAVE_FMOD 1/
+/^#undef HAVE_GAI_STRERROR *$/c\
+#ifdef __MINGW32__\
+#define HAVE_GAI_STRERROR 1\
+#endif
 /^#undef HAVE_GETADDRINFO *$/c\
 #ifdef __MINGW32__\
 #define HAVE_GETADDRINFO 1\

-----------------------------------------------------------------------

Summary of changes:
 pc/ChangeLog    | 14 ++++++++++++++
 pc/Makefile     |  5 +++--
 pc/Makefile.tst |  2 +-
 pc/config.h     | 11 ++++++++---
 pc/config.sed   |  4 ++++
 5 files changed, 30 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
gawk