]> ncurses.scripts.mit.edu Git - ncurses.git/commitdiff
projects / ncurses.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: d129a54)
ncurses 5.9 - patch 20140510
authorThomas E. Dickey <dickey@invisible-island.net>
Sun, 11 May 2014 00:01:10 +0000 (00:01 +0000)
committerThomas E. Dickey <dickey@invisible-island.net>
Sun, 11 May 2014 00:01:10 +0000 (00:01 +0000)
+ cleanup recently introduced compiler warnings for MingW port.
+ workaround for ${MAKEFLAGS} configure check versus GNU make 4.0,
  which introduces more than one gratuitous incompatibility.

14 files changed:
Ada95/aclocal.m4 patch | blob | history
Ada95/configure patch | blob | history
NEWS patch | blob | history
aclocal.m4 patch | blob | history
configure patch | blob | history
dist.mk patch | blob | history
ncurses/base/lib_getch.c patch | blob | history
ncurses/win32con/win_driver.c patch | blob | history
package/debian-mingw/changelog patch | blob | history
package/debian-mingw64/changelog patch | blob | history
package/debian/changelog patch | blob | history
package/mingw-ncurses.nsi patch | blob | history
package/mingw-ncurses.spec patch | blob | history
package/ncurses.spec patch | blob | history

diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4
index 16773e0397cdf42389dac1ac60d023633557c0ba..c107052a6a259bfaf0f66f56b91ff9d329e4e038 100644 (file)
--- a/Ada95/aclocal.m4
+++ b/Ada95/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey
 dnl
-dnl $Id: aclocal.m4,v 1.79 2014/04/12 22:30:34 tom Exp $
+dnl $Id: aclocal.m4,v 1.80 2014/05/10 21:08:22 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -1900,7 +1900,7 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
+dnl CF_MAKEFLAGS version: 15 updated: 2014/05/10 16:43:23
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
@@ -1919,7 +1919,7 @@ all :
 CF_EOF
                cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[   ]]*$,,'`
                case "$cf_result" in
-               .*k)
+               .*k|.*kw)
                        cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
                        case "$cf_result" in
                        .*CC=*) cf_cv_makeflags=
diff --git a/Ada95/configure b/Ada95/configure
index 429918e1836d9d5435a2a6906fa7a0a68a8c6689..a21bbc9fc86581951c9a6edb4c6ea9c13161e31a 100644 (file)
--- a/Ada95/configure
+++ b/Ada95/configure
@@ -2912,7 +2912,7 @@ all :
 CF_EOF
                cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[    ]*$,,'`
                case "$cf_result" in
-               .*k)
+               .*k|.*kw)
                        cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
                        case "$cf_result" in
                        .*CC=*) cf_cv_makeflags=
diff --git a/NEWS b/NEWS
index eaafe6f2811f628c11c29684c48326f637009324..4cae0e2c04f4ab379ebee22243d5112ed61f8c88 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.2199 2014/05/03 23:22:01 tom Exp $
+-- $Id: NEWS,v 1.2201 2014/05/10 21:07:15 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,11 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20140510
+       + cleanup recently introduced compiler warnings for MingW port.
+       + workaround for ${MAKEFLAGS} configure check versus GNU make 4.0,
+         which introduces more than one gratuitous incompatibility.
+
 20140503
        + add vt520ansi terminfo entry (patch by Mike Gran)
        + further improve MinGW support for the scenario where there is an
diff --git a/aclocal.m4 b/aclocal.m4
index 69f1e12ec156eb9942ba2a13a8c5dcad475b7292..e45bace613e047c0c9a578e15f15a21d89c7ef4c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.688 2014/04/12 22:28:53 tom Exp $
+dnl $Id: aclocal.m4,v 1.690 2014/05/10 21:07:38 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -3930,7 +3930,7 @@ int main()
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
+dnl CF_MAKEFLAGS version: 15 updated: 2014/05/10 16:43:23
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
@@ -3949,7 +3949,7 @@ all :
 CF_EOF
                cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[   ]]*$,,'`
                case "$cf_result" in
-               .*k)
+               .*k|.*kw)
                        cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
                        case "$cf_result" in
                        .*CC=*) cf_cv_makeflags=
diff --git a/configure b/configure
index 0b466077aeca5d0be639054a1aa99efed866e6f3..d7e18069bb8ded1ebe15dfec30d0767c76b6bde5 100755 (executable)
--- a/configure
+++ b/configure
@@ -3709,7 +3709,7 @@ all :
 CF_EOF
                cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[    ]*$,,'`
                case "$cf_result" in
-               .*k)
+               .*k|.*kw)
                        cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
                        case "$cf_result" in
                        .*CC=*) cf_cv_makeflags=
diff --git a/dist.mk b/dist.mk
index 58eeca0260416a4bc06f675ee2dd4fa4df05e0ea..afddfc2704b38402e79ed3a84a8cdd9287649526 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.984 2014/05/03 15:27:36 tom Exp $
+# $Id: dist.mk,v 1.985 2014/05/10 14:37:35 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 9
-NCURSES_PATCH = 20140503
+NCURSES_PATCH = 20140510
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index 53e2c05669655db469db7870511be88268688d5f..ff2c5bdfd433b3499176e5286fbf1ba8df5d6e4d 100644 (file)
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getch.c,v 1.130 2014/05/03 20:49:50 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.131 2014/05/10 20:36:57 tom Exp $")
 
 #include <fifo_defs.h>
 
@@ -124,6 +124,17 @@ _nc_use_meta(WINDOW *win)
     return (sp ? sp->_use_meta : 0);
 }
 
+#ifdef USE_TERM_DRIVER
+# ifdef __MINGW32__
+static HANDLE
+_nc_get_handle(int fd)
+{
+    intptr_t value = _get_osfhandle(fd);
+    return (HANDLE) value;
+}
+# endif
+#endif
+
 /*
  * Check for mouse activity, returning nonzero if we find any.
  */
@@ -138,7 +149,7 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl))
 # ifdef __MINGW32__
     /* if we emulate terminfo on console, we have to use the console routine */
     if (IsTermInfoOnConsole(sp)) {
-       HANDLE fd = (HANDLE) _get_osfhandle(sp->_ifd);
+       HANDLE fd = _nc_get_handle(sp->_ifd);
        rc = _nc_mingw_testmouse(sp, fd, delay EVENTLIST_2nd(evl));
     } else
 # endif
@@ -280,7 +291,7 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
 #ifdef __MINGW32__
        if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak)
            n = _nc_mingw_console_read(sp,
-                                      (HANDLE) _get_osfhandle(sp->_ifd),
+                                      _nc_get_handle(sp->_ifd),
                                       &buf);
        else
 #endif
diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c
index fa1c39097a20cf94acb731eedc6502072cec3d43..443476460eb1fd23c20193000a248c76b8f4562b 100644 (file)
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@@ -45,7 +45,7 @@
 
 #define CUR my_term.type.
 
-MODULE_ID("$Id: win_driver.c,v 1.36 2014/05/03 20:48:51 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.38 2014/05/10 21:50:00 tom Exp $")
 
 #ifndef __GNUC__
 #  error We need GCC to compile for MinGW
@@ -1758,6 +1758,7 @@ int
 _nc_mingw_tcflush(int fd, int queue)
 {
     TC_PROLOGUE(fd);
+    (void) term;
 
     if (_nc_mingw_isconsole(fd)) {
        if (queue == TCIFLUSH) {
@@ -1877,7 +1878,7 @@ __attribute__((constructor))
              rkeycompare);
 
        if (GetNumberOfConsoleMouseButtons(&num_buttons)) {
-           CON.numButtons = num_buttons;
+           CON.numButtons = (int) num_buttons;
        } else {
            CON.numButtons = 1;
        }
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 71763fdbe5c0220712e9312962380bdc5dd94268..9ff697a49897b00deb2e7285c4c45f544eeb0569 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20140503) unstable; urgency=low
+ncurses6 (5.9-20140510) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 May 2014 11:27:36 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 May 2014 10:37:35 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 71763fdbe5c0220712e9312962380bdc5dd94268..9ff697a49897b00deb2e7285c4c45f544eeb0569 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20140503) unstable; urgency=low
+ncurses6 (5.9-20140510) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 May 2014 11:27:36 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 May 2014 10:37:35 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 9bda581d876f88e99454d169f34adf03514d81f2..adca77dc5fc527e7db5c599830515b05a7095168 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20140503) unstable; urgency=low
+ncurses6 (5.9-20140510) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 May 2014 11:27:36 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 May 2014 10:37:35 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 4b53a687653d1f9dc2f6654afcff580fe695c1e2..8a4ae5fb9626fe98143404c4da365444093e47b5 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.39 2014/05/03 15:27:36 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.40 2014/05/10 14:37:35 tom Exp $\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "5"\r
 !define VERSION_MINOR "9"\r
 !define VERSION_YYYY  "2014"\r
-!define VERSION_MMDD  "0503"\r
+!define VERSION_MMDD  "0510"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 1224eca91d9cdcf4f28474cb85797a54d068f92c..5bbf402121fdd0d90735a1a75fec9c3b28f3d466 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 5.9
-Release: 20140503
+Release: 20140510
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 913b3a2e1b49b29f6c300a9da02fbaa3d2c9f9e0..3e11caaa484bd3c807d0e04635daf40581e7411a 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 5.9
-Release: 20140503
+Release: 20140510
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
ncurses, with patches starting at ncurses-5.6; new users should use https://github.com/ThomasDickey/ncurses-snapshots/