[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-841-gf32d60e

[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, gawk-4.1-stable has been updated
       via  f32d60edb8a3325e27953787b7fb9f051423b6bc (commit)
      from  e53e3aac9604a9ce7563f045249b41ebfb0c2e4e (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=f32d60edb8a3325e27953787b7fb9f051423b6bc

commit f32d60edb8a3325e27953787b7fb9f051423b6bc
Author: Eli Zaretskii <address@hidden>
Date:   Wed Mar 16 19:13:19 2016 +0200

    Fix compilation errors and warnings with MinGW 3.21 and later.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index fb44a48..5a7d967 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,15 @@
+2016-03-16  Eli Zaretskii  <address@hidden>
+
+       * gawkmisc.pc (usleep): Condition on MinGW runtime version older
+       than 3.21, which defines 'usleep' as an inline function in
+       unistd.h, and thus causes compilation errors due to conflicting
+       definitions.  Reported by Ivan Suchý <address@hidden>.
+
+       * Makefile (mingw32, mingw32-readline, mingw32-mpfr)
+       (mingw32-readline-mpfr): Use -Wno-deprecated-declarations, to
+       avoid warnings about 'usleep' in newer versions of mingw.org's
+       MinGW runtime.
+
 2015-05-29         Arnold D. Robbins     <address@hidden>
 
        * Makefile.tst (negtime): Sync with mainline.
diff --git a/pc/Makefile b/pc/Makefile
index d1c0806..23b9046 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -168,28 +168,28 @@ LMINGW32 = $(CC) $(LF) -o $@ $(GAWKOBJS) $(LF2)
 
 mingw32:
        $(MAK) all \
-       CC=gcc O=.o CF="-D__USE_MINGW_ANSI_STDIO -O2 -gdwarf-2 -g3" \
+       CC=gcc O=.o CF="-D__USE_MINGW_ANSI_STDIO -O2 -gdwarf-2 -g3 
-Wno-deprecated-declarations" \
        OBJ=popen.o LNK=LMINGW32 LF="-gdwarf-2 -g3" \
         LF2="-lws2_32 -lmsvcp60" RSP=
 
 mingw32-readline:
        $(MAK) all \
        CC=gcc O=.o \
-       CF="-D__USE_MINGW_ANSI_STDIO -DHAVE_LIBREADLINE -O2 -gdwarf-2 -g3" \
+       CF="-D__USE_MINGW_ANSI_STDIO -DHAVE_LIBREADLINE -O2 -gdwarf-2 -g3 
-Wno-deprecated-declarations" \
        OBJ=popen.o LNK=LMINGW32 LF="-gdwarf-2 -g3" \
        LF2="-lreadline -lws2_32 -lmsvcp60 -Wl,--enable-auto-import" RSP=
 
 mingw32-mpfr:
        $(MAK) all \
        CC=gcc O=.o \
-       CF="-D__USE_MINGW_ANSI_STDIO -DHAVE_MPFR -O2 -gdwarf-2 -g3" \
+       CF="-D__USE_MINGW_ANSI_STDIO -DHAVE_MPFR -O2 -gdwarf-2 -g3 
-Wno-deprecated-declarations" \
        OBJ=popen.o LNK=LMINGW32 LF="-gdwarf-2 -g3" \
        LF2="-lmpfr -lgmp -lws2_32 -lmsvcp60 -Wl,--enable-auto-import" RSP=
 
 mingw32-readline-mpfr:
        $(MAK) all \
        CC=gcc O=.o \
-       CF="-D__USE_MINGW_ANSI_STDIO -DHAVE_LIBREADLINE -DHAVE_MPFR -O2 
-gdwarf-2 -g3" \
+       CF="-D__USE_MINGW_ANSI_STDIO -DHAVE_LIBREADLINE -DHAVE_MPFR -O2 
-gdwarf-2 -g3 -Wno-deprecated-declarations" \
        OBJ=popen.o LNK=LMINGW32 LF="-gdwarf-2 -g3" \
        LF2="-lmpfr -lgmp -lreadline -lws2_32 -lmsvcp60 
-Wl,--enable-auto-import" RSP=
 
diff --git a/pc/gawkmisc.pc b/pc/gawkmisc.pc
index fdd32e7..486b185 100644
--- a/pc/gawkmisc.pc
+++ b/pc/gawkmisc.pc
@@ -584,6 +584,9 @@ unsetenv (const char *name)
   return setenv (name, "", 1);
 }
 
+/* MinGW 3.21 and later defines usleep as an inline function in
+   unistd.h, which conflicts with the version below.  */
+#if __MINGW32_MAJOR_VERSION + (__MINGW32_MINOR_VERSION > 20) < 4
 int
 usleep(unsigned int usec)
 {
@@ -593,6 +596,7 @@ usleep(unsigned int usec)
 
   return usec - msecf * 1000 < 0 ? 0 : (int)(usec - msecf * 1000);
 }
+#endif
 
 /* The implementation of wctob in the MS runtime is problematic
    because it doesn't allow to distinguish between WEOF and 0xff, due

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

Summary of changes:
 pc/ChangeLog   |   12 ++++++++++++
 pc/Makefile    |    8 ++++----
 pc/gawkmisc.pc |    4 ++++
 3 files changed, 20 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
gawk