ncurses 5.9 - patch 20120218

+ correct CF_ETIP_DEFINES configure macro, making it exit properly on the first success (patch by Pierre Labastie). + improve configure macro CF_MKSTEMP by moving existence-check for mkstemp out of the AC_TRY_RUN, to help with cross-compiles. + improve configure macro CF_FUNC_POLL from luit changes to detect broken implementations, e.g., with Mac OS X. + add configure option --with-tparm-arg + build-fix for MinGW cross-compiling, so that make_hash does not depend on TTY definition (cf: 20111008).
2024-11-27 06:49:54 +08:00 · 2012-02-19 02:09:31 +00:00 · 2012-02-19 02:09:31 +00:00 · a3173aa5ed
commit a3173aa5ed
parent 8e6d0cc266
16 changed files with 2169 additions and 2066 deletions
--- 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.44 2012/01/22 00:33:42 tom Exp $
+dnl $Id: aclocal.m4,v 1.45 2012/02/18 23:21:42 tom Exp $
 dnl Macros used in NCURSES Ada95 auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@ -2045,7 +2045,7 @@ fi
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
+dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56
 dnl ----------
 dnl Check for a working mkstemp.  This creates two files, checks that they are
 dnl successfully created and distinct (AmigaOS apparently fails on the last).
@ -2087,9 +2087,11 @@ int main()
 }
 ],[cf_cv_func_mkstemp=yes
 ],[cf_cv_func_mkstemp=no
-],[AC_CHECK_FUNC(mkstemp)
-])
+],[cf_cv_func_mkstemp=maybe])
 ])
+if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+	AC_CHECK_FUNC(mkstemp)
+fi
 if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
 	AC_DEFINE(HAVE_MKSTEMP)
 fi
--- a/Ada95/configure
+++ b/Ada95/configure
@ -11385,68 +11385,10 @@ else

 rm -rf conftest*
 if test "$cross_compiling" = yes; then
-  echo "$as_me:11388: checking for mkstemp" >&5
-echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
-if test "${ac_cv_func_mkstemp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  cf_cv_func_mkstemp=maybe
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 11394 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char mkstemp (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char mkstemp ();
-char (*f) ();
-
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
-choke me
-#else
-f = mkstemp;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11425: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:11428: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11431: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:11434: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_mkstemp=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_func_mkstemp=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:11444: result: $ac_cv_func_mkstemp" >&5
-echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line 11449 "configure"
+#line 11391 "configure"
 #include "confdefs.h"

 #include <sys/types.h>
@ -11484,15 +11426,15 @@ int main()

 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11429: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
-  echo "$as_me:11490: \$? = $ac_status" >&5
+  echo "$as_me:11432: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11434: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11495: \$? = $ac_status" >&5
+  echo "$as_me:11437: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  cf_cv_func_mkstemp=yes

@ -11507,8 +11449,69 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi

 fi
-echo "$as_me:11510: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:11452: result: $cf_cv_func_mkstemp" >&5
 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
+if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+	echo "$as_me:11455: checking for mkstemp" >&5
+echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
+if test "${ac_cv_func_mkstemp+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 11461 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char mkstemp (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char mkstemp ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
+choke me
+#else
+f = mkstemp;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:11492: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11495: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11498: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11501: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_mkstemp=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_mkstemp=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:11511: result: $ac_cv_func_mkstemp" >&5
+echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
+
+fi
 if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
 	cat >>confdefs.h <<\EOF
 #define HAVE_MKSTEMP 1
@ -11516,13 +11519,13 @@ EOF

 fi

-echo "$as_me:11519: checking return type of signal handlers" >&5
+echo "$as_me:11522: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
-#line 11525 "configure"
+#line 11528 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@ -11544,16 +11547,16 @@ int i;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11550: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
-  echo "$as_me:11550: \$? = $ac_status" >&5
+  echo "$as_me:11553: \$? = $ac_status" >&5
  (exit $ac_status); } &&
         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11556: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:11556: \$? = $ac_status" >&5
+  echo "$as_me:11559: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_type_signal=void
 else
@ -11563,7 +11566,7 @@ ac_cv_type_signal=int
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:11566: result: $ac_cv_type_signal" >&5
+echo "$as_me:11569: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6

 cat >>confdefs.h <<EOF
@ -11581,7 +11584,7 @@ if test "$cf_with_ada" != "no" ; then
 cf_ada_make=gnatmake
 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
 set dummy $cf_ada_make; ac_word=$2
-echo "$as_me:11584: checking for $ac_word" >&5
+echo "$as_me:11587: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_gnat_exists+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@ -11596,7 +11599,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_gnat_exists="yes"
-echo "$as_me:11599: found $ac_dir/$ac_word" >&5
+echo "$as_me:11602: found $ac_dir/$ac_word" >&5
 break
 done

@ -11605,10 +11608,10 @@ fi
 fi
 gnat_exists=$ac_cv_prog_gnat_exists
 if test -n "$gnat_exists"; then
-  echo "$as_me:11608: result: $gnat_exists" >&5
+  echo "$as_me:11611: result: $gnat_exists" >&5
 echo "${ECHO_T}$gnat_exists" >&6
 else
-  echo "$as_me:11611: result: no" >&5
+  echo "$as_me:11614: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi

@ -11617,12 +11620,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then
   cf_cv_prog_gnat_correct=no
 else

-echo "$as_me:11620: checking for gnat version" >&5
+echo "$as_me:11623: checking for gnat version" >&5
 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
 	grep '[0-9].[0-9][0-9]*' |\
    sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
-echo "$as_me:11625: result: $cf_gnat_version" >&5
+echo "$as_me:11628: result: $cf_gnat_version" >&5
 echo "${ECHO_T}$cf_gnat_version" >&6

 case $cf_gnat_version in #(vi
@ -11630,7 +11633,7 @@ case $cf_gnat_version in #(vi
 	cf_cv_prog_gnat_correct=yes
 	;;
 *)
-	{ echo "$as_me:11633: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+	{ echo "$as_me:11636: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
 	cf_cv_prog_gnat_correct=no
 	;;
@ -11638,7 +11641,7 @@ esac

   # Extract the first word of "m4", so it can be a program name with args.
 set dummy m4; ac_word=$2
-echo "$as_me:11641: checking for $ac_word" >&5
+echo "$as_me:11644: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_M4_exists+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@ -11653,7 +11656,7 @@ for ac_dir in $ac_dummy; do
  test -z "$ac_dir" && ac_dir=.
  $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_M4_exists="yes"
-echo "$as_me:11656: found $ac_dir/$ac_word" >&5
+echo "$as_me:11659: found $ac_dir/$ac_word" >&5
 break
 done

@ -11662,10 +11665,10 @@ fi
 fi
 M4_exists=$ac_cv_prog_M4_exists
 if test -n "$M4_exists"; then
-  echo "$as_me:11665: result: $M4_exists" >&5
+  echo "$as_me:11668: result: $M4_exists" >&5
 echo "${ECHO_T}$M4_exists" >&6
 else
-  echo "$as_me:11668: result: no" >&5
+  echo "$as_me:11671: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi

@ -11674,7 +11677,7 @@ fi
      echo Ada95 binding required program m4 not found. Ada95 binding disabled.
   fi
   if test "$cf_cv_prog_gnat_correct" = yes; then
-      echo "$as_me:11677: checking if GNAT works" >&5
+      echo "$as_me:11680: checking if GNAT works" >&5
 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6

 rm -rf conftest* *~conftest*
@ -11702,7 +11705,7 @@ else
 fi
 rm -rf conftest* *~conftest*

-      echo "$as_me:11705: result: $cf_cv_prog_gnat_correct" >&5
+      echo "$as_me:11708: result: $cf_cv_prog_gnat_correct" >&5
 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
   fi
 fi
@ -11725,7 +11728,7 @@ fi
 			;;
 		esac

-echo "$as_me:11728: checking if GNAT supports generics" >&5
+echo "$as_me:11731: checking if GNAT supports generics" >&5
 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
 case $cf_gnat_version in #(vi
 3.[1-9]*|[4-9].*) #(vi
@ -11735,7 +11738,7 @@ case $cf_gnat_version in #(vi
 	cf_gnat_generics=no
 	;;
 esac
-echo "$as_me:11738: result: $cf_gnat_generics" >&5
+echo "$as_me:11741: result: $cf_gnat_generics" >&5
 echo "${ECHO_T}$cf_gnat_generics" >&6

 if test "$cf_gnat_generics" = yes
@ -11747,7 +11750,7 @@ else
 	cf_generic_objects=
 fi

-echo "$as_me:11750: checking if GNAT supports SIGINT" >&5
+echo "$as_me:11753: checking if GNAT supports SIGINT" >&5
 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
 if test "${cf_cv_gnat_sigint+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@ -11795,7 +11798,7 @@ fi
 rm -rf conftest* *~conftest*

 fi
-echo "$as_me:11798: result: $cf_cv_gnat_sigint" >&5
+echo "$as_me:11801: result: $cf_cv_gnat_sigint" >&5
 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6

 if test $cf_cv_gnat_sigint = yes ; then
@ -11804,7 +11807,7 @@ else
 	USE_GNAT_SIGINT="#"
 fi

-echo "$as_me:11807: checking if GNAT pragma Unreferenced works" >&5
+echo "$as_me:11810: checking if GNAT pragma Unreferenced works" >&5
 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
 if test "${cf_cv_pragma_unreferenced+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
@ -11835,7 +11838,7 @@ fi
 rm -rf conftest* *~conftest*

 fi
-echo "$as_me:11838: result: $cf_cv_pragma_unreferenced" >&5
+echo "$as_me:11841: result: $cf_cv_pragma_unreferenced" >&5
 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6

 # if the pragma is supported, use it (needed in the Trace code).
@ -11848,7 +11851,7 @@ fi
 cf_gnat_libraries=no
 cf_gnat_projects=no

-echo "$as_me:11851: checking if GNAT supports project files" >&5
+echo "$as_me:11854: checking if GNAT supports project files" >&5
 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
 case $cf_gnat_version in #(vi
 3.[0-9]*) #(vi
@ -11916,14 +11919,14 @@ CF_EOF
 	esac
 	;;
 esac
-echo "$as_me:11919: result: $cf_gnat_projects" >&5
+echo "$as_me:11922: result: $cf_gnat_projects" >&5
 echo "${ECHO_T}$cf_gnat_projects" >&6

 if test $cf_gnat_projects = yes
 then
-	echo "$as_me:11924: checking if GNAT supports libraries" >&5
+	echo "$as_me:11927: checking if GNAT supports libraries" >&5
 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
-	echo "$as_me:11926: result: $cf_gnat_libraries" >&5
+	echo "$as_me:11929: result: $cf_gnat_libraries" >&5
 echo "${ECHO_T}$cf_gnat_libraries" >&6
 fi

@ -11943,7 +11946,7 @@ else
 	USE_GNAT_LIBRARIES="#"
 fi

-echo "$as_me:11946: checking for ada-compiler" >&5
+echo "$as_me:11949: checking for ada-compiler" >&5
 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6

 # Check whether --with-ada-compiler or --without-ada-compiler was given.
@ -11954,12 +11957,12 @@ else
  cf_ada_compiler=gnatmake
 fi;

-echo "$as_me:11957: result: $cf_ada_compiler" >&5
+echo "$as_me:11960: result: $cf_ada_compiler" >&5
 echo "${ECHO_T}$cf_ada_compiler" >&6

 		cf_ada_package=terminal_interface

-echo "$as_me:11962: checking for ada-include" >&5
+echo "$as_me:11965: checking for ada-include" >&5
 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6

 # Check whether --with-ada-include or --without-ada-include was given.
@ -11995,7 +11998,7 @@ case ".$withval" in #(vi
  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
  ;;
 *)
-  { { echo "$as_me:11998: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:12001: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
   { (exit 1); exit 1; }; }
  ;;
@ -12004,10 +12007,10 @@ esac
 fi
 ADA_INCLUDE="$withval"

-echo "$as_me:12007: result: $ADA_INCLUDE" >&5
+echo "$as_me:12010: result: $ADA_INCLUDE" >&5
 echo "${ECHO_T}$ADA_INCLUDE" >&6

-echo "$as_me:12010: checking for ada-objects" >&5
+echo "$as_me:12013: checking for ada-objects" >&5
 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6

 # Check whether --with-ada-objects or --without-ada-objects was given.
@ -12043,7 +12046,7 @@ case ".$withval" in #(vi
  withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
  ;;
 *)
-  { { echo "$as_me:12046: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:12049: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
   { (exit 1); exit 1; }; }
  ;;
@ -12052,10 +12055,10 @@ esac
 fi
 ADA_OBJECTS="$withval"

-echo "$as_me:12055: result: $ADA_OBJECTS" >&5
+echo "$as_me:12058: result: $ADA_OBJECTS" >&5
 echo "${ECHO_T}$ADA_OBJECTS" >&6

-echo "$as_me:12058: checking if an Ada95 shared-library should be built" >&5
+echo "$as_me:12061: checking if an Ada95 shared-library should be built" >&5
 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6

 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
@ -12065,7 +12068,7 @@ if test "${with_ada_sharedlib+set}" = set; then
 else
  with_ada_sharedlib=no
 fi;
-echo "$as_me:12068: result: $with_ada_sharedlib" >&5
+echo "$as_me:12071: result: $with_ada_sharedlib" >&5
 echo "${ECHO_T}$with_ada_sharedlib" >&6

 ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
@ -12081,12 +12084,12 @@ then
 fi

 	else
-		{ { echo "$as_me:12084: error: No usable Ada compiler found" >&5
+		{ { echo "$as_me:12087: error: No usable Ada compiler found" >&5
 echo "$as_me: error: No usable Ada compiler found" >&2;}
   { (exit 1); exit 1; }; }
 	fi
 else
-	{ { echo "$as_me:12089: error: The Ada compiler is needed for this package" >&5
+	{ { echo "$as_me:12092: error: The Ada compiler is needed for this package" >&5
 echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
   { (exit 1); exit 1; }; }
 fi
@ -12133,7 +12136,7 @@ elif test "$includedir" != "/usr/include"; then
 fi

 ### Build up pieces for makefile rules
-echo "$as_me:12136: checking default library suffix" >&5
+echo "$as_me:12139: checking default library suffix" >&5
 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6

 	case $DFT_LWR_MODEL in
@ -12144,10 +12147,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
 	shared)  DFT_ARG_SUFFIX=''   ;;
 	esac
 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:12147: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:12150: result: $DFT_ARG_SUFFIX" >&5
 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6

-echo "$as_me:12150: checking default library-dependency suffix" >&5
+echo "$as_me:12153: checking default library-dependency suffix" >&5
 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6

 	case $DFT_LWR_MODEL in #(vi
@ -12200,10 +12203,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
 	esac
 	test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
 	test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
-echo "$as_me:12203: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:12206: result: $DFT_DEP_SUFFIX" >&5
 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6

-echo "$as_me:12206: checking default object directory" >&5
+echo "$as_me:12209: checking default object directory" >&5
 echo $ECHO_N "checking default object directory... $ECHO_C" >&6

 	case $DFT_LWR_MODEL in
@ -12219,7 +12222,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
 			DFT_OBJ_SUBDIR='obj_s' ;;
 		esac
 	esac
-echo "$as_me:12222: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:12225: result: $DFT_OBJ_SUBDIR" >&5
 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6

 ### Set up low-level terminfo dependencies for makefiles.
@ -12435,7 +12438,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:12438: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:12441: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@ -12611,7 +12614,7 @@ cat >>$CONFIG_STATUS <<\EOF
    echo "$ac_cs_version"; exit 0 ;;
  --he | --h)
    # Conflict between --help and --header
-    { { echo "$as_me:12614: error: ambiguous option: $1
+    { { echo "$as_me:12617: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@ -12630,7 +12633,7 @@ Try \`$0 --help' for more information." >&2;}
    ac_need_defaults=false;;

  # This is an error.
-  -*) { { echo "$as_me:12633: error: unrecognized option: $1
+  -*) { { echo "$as_me:12636: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@ -12702,7 +12705,7 @@ do
  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
  "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
  "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
-  *) { { echo "$as_me:12705: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:12708: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
   { (exit 1); exit 1; }; };;
  esac
@ -13020,7 +13023,7 @@ done; }
  esac

  if test x"$ac_file" != x-; then
-    { echo "$as_me:13023: creating $ac_file" >&5
+    { echo "$as_me:13026: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
    rm -f "$ac_file"
  fi
@ -13038,7 +13041,7 @@ echo "$as_me: creating $ac_file" >&6;}
      -) echo $tmp/stdin ;;
      [\\/$]*)
         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13041: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13044: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         echo $f;;
@ -13051,7 +13054,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
           echo $srcdir/$f
         else
           # /dev/null tree
-           { { echo "$as_me:13054: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13057: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         fi;;
@ -13117,7 +13120,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
  * )   ac_file_in=$ac_file.in ;;
  esac

-  test x"$ac_file" != x- && { echo "$as_me:13120: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:13123: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}

  # First look for the input files in the build tree, otherwise in the
@ -13128,7 +13131,7 @@ echo "$as_me: creating $ac_file" >&6;}
      -) echo $tmp/stdin ;;
      [\\/$]*)
         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13131: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13134: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         echo $f;;
@ -13141,7 +13144,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
           echo $srcdir/$f
         else
           # /dev/null tree
-           { { echo "$as_me:13144: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13147: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
   { (exit 1); exit 1; }; }
         fi;;
@ -13199,7 +13202,7 @@ cat >>$CONFIG_STATUS <<\EOF
  rm -f $tmp/in
  if test x"$ac_file" != x-; then
    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:13202: $ac_file is unchanged" >&5
+      { echo "$as_me:13205: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
    else
      ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--- a/11
+++ b/11
@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
-- $Id: INSTALL,v 1.163 2012/02/11 16:20:42 tom Exp $
+-- $Id: INSTALL,v 1.164 2012/02/18 21:27:33 tom Exp $
 ---------------------------------------------------------------------
             How to install Ncurses/Terminfo on your system
 ---------------------------------------------------------------------
@ -1017,6 +1017,15 @@ SUMMARY OF CONFIGURE OPTIONS:
 	library dependencies for tic and other programs built with the tic
 	library.

+    --with-tparm-arg[=XXX]
+	Override the type used for tparm() arguments, which normally is a
+	"long".  However the function must assume that its arguments can hold a
+	pointer to char's which is not always workable for 64-bit platforms.  A
+	better choice would be intptr_t, which was not available at the time
+	tparm's interface was defined.
+
+	If the option is not given, this defaults to "long".
+
    --with-trace
 	Configure the trace() function as part of the all models of the ncurses
 	library.  Normally it is part of the debug (libncurses_g) library only.
--- a/13
+++ b/13
@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
-- $Id: NEWS,v 1.1857 2012/02/11 23:39:31 tom Exp $
+-- $Id: NEWS,v 1.1861 2012/02/18 23:11:09 tom Exp $
 -------------------------------------------------------------------------------

 This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,17 @@ 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.

+20120218
+	+ correct CF_ETIP_DEFINES configure macro, making it exit properly on
+	  the first success (patch by Pierre Labastie).
+	+ improve configure macro CF_MKSTEMP by moving existence-check for
+	  mkstemp out of the AC_TRY_RUN, to help with cross-compiles.
+	+ improve configure macro CF_FUNC_POLL from luit changes to detect
+	  broken implementations, e.g., with Mac OS X.
+	+ add configure option --with-tparm-arg
+	+ build-fix for MinGW cross-compiling, so that make_hash does not
+	  depend on TTY definition (cf: 20111008).
+
 20120211
 	+ make sgr for xterm-pcolor agree with other caps -TD
 	+ make sgr for att5425 agree with other caps -TD
--- 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.604 2012/01/22 00:30:35 tom Exp $
+dnl $Id: aclocal.m4,v 1.605 2012/02/18 23:06:14 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@ -1306,7 +1306,7 @@ AC_DEFUN([CF_ERRNO],
 CF_CHECK_ERRNO(errno)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ETIP_DEFINES version: 4 updated: 2011/12/03 16:54:03
+dnl CF_ETIP_DEFINES version: 5 updated: 2012/02/18 17:51:07
 dnl ---------------
 dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between
 dnl math.h and builtin.h, only for ncurses
@ -1334,7 +1334,7 @@ AC_TRY_COMPILE([
 	test -n "$cf_math" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_math})
 	test -n "$cf_excp" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_excp})
 	cf_result="$cf_math $cf_excp"
-	break
+	break 2
 ],[])
 done
 done
@ -1600,7 +1600,7 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30
+dnl CF_FUNC_POLL version: 5 updated: 2012/01/25 17:55:38
 dnl ------------
 dnl See if the poll function really works.  Some platforms have poll(), but
 dnl it does not work for terminals or files.
@ -1617,10 +1617,29 @@ int main() {
 	struct pollfd myfds;
 	int ret;

-	myfds.fd = 0;
+	/* check for Darwin bug with respect to "devices" */
+	myfds.fd = open("/dev/null", 1);
+	if (myfds.fd < 0)
+		myfds.fd = 0;
 	myfds.events = POLLIN;
+	myfds.revents = 0;

 	ret = poll(&myfds, 1, 100);
+
+	if (ret < 0 || (myfds.revents & POLLNVAL)) {
+		ret = -1;
+	} else {
+
+		/* also check with standard input */
+		myfds.fd = 0;
+		myfds.events = POLLIN;
+		myfds.revents = 0;
+
+		ret = poll(&myfds, 1, 100);
+		if (ret < 0) {
+			ret = 0;
+		}
+	}
 	${cf_cv_main_return:-return}(ret != 0);
 }],
 	[cf_cv_working_poll=yes],
@ -4394,7 +4413,7 @@ fi
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
+dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56
 dnl ----------
 dnl Check for a working mkstemp.  This creates two files, checks that they are
 dnl successfully created and distinct (AmigaOS apparently fails on the last).
@ -4436,9 +4455,11 @@ int main()
 }
 ],[cf_cv_func_mkstemp=yes
 ],[cf_cv_func_mkstemp=no
-],[AC_CHECK_FUNC(mkstemp)
-])
+],[cf_cv_func_mkstemp=maybe])
 ])
+if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+	AC_CHECK_FUNC(mkstemp)
+fi
 if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
 	AC_DEFINE(HAVE_MKSTEMP)
 fi
--- a/3798
+++ b/3798
--- a/configure.in
+++ b/configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.541 2012/02/11 20:24:11 tom Exp $
+dnl $Id: configure.in,v 1.543 2012/02/18 21:31:19 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.541 $)
+AC_REVISION($Revision: 1.543 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)

@ -851,6 +851,15 @@ AC_ARG_WITH(ccharw-max,
 AC_MSG_RESULT($NCURSES_CCHARW_MAX)
 AC_SUBST(NCURSES_CCHARW_MAX)

+###   use option --with-tparm-arg to override tparm's argument type
+AC_MSG_CHECKING(for type of tparm args)
+AC_ARG_WITH(tparm-arg,
+	[  --with-tparm-arg=TYPE   override parameter type of tparm],
+	[NCURSES_TPARM_ARG="$withval"],
+	[NCURSES_TPARM_ARG=long])
+AC_MSG_RESULT($NCURSES_TPARM_ARG)
+AC_SUBST(NCURSES_TPARM_ARG)
+
 ### Enable compiling-in rcs id's
 AC_MSG_CHECKING(if RCS identifiers should be compiled-in)
 AC_ARG_WITH(rcs-ids,
--- 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.857 2012/02/11 14:48:13 tom Exp $
+# $Id: dist.mk,v 1.858 2012/02/18 15:30:39 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 = 20120211
+NCURSES_PATCH = 20120218

 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
--- a/include/curses.h.in
+++ b/include/curses.h.in
@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
 *                                                                          *
 * Permission is hereby granted, free of charge, to any person obtaining a  *
 * copy of this software and associated documentation files (the            *
@ -32,7 +32,7 @@
 *     and: Thomas E. Dickey                        1996-on                 *
 ****************************************************************************/

-/* $Id: curses.h.in,v 1.227 2011/10/29 20:01:35 tom Exp $ */
+/* $Id: curses.h.in,v 1.228 2012/02/18 21:34:30 tom Exp $ */

 #ifndef __NCURSES_H
 #define __NCURSES_H
@ -128,6 +128,13 @@
 #undef NCURSES_TPARM_VARARGS
 #define NCURSES_TPARM_VARARGS @NCURSES_TPARM_VARARGS@

+/*
+ * Control type used for tparm's arguments.  While X/Open equates long and
+ * char* values, this is not always workable for 64-bit platforms.
+ */
+#undef NCURSES_TPARM_ARG
+#define NCURSES_TPARM_ARG @NCURSES_TPARM_ARG@
+
 /*
 * NCURSES_CH_T is used in building the library, but not used otherwise in
 * this header file, since that would make the normal/wide-character versions
@ -838,7 +845,7 @@ extern NCURSES_EXPORT(int) putp (const char *);				/* implemented */
 #if NCURSES_TPARM_VARARGS
 extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
 #else
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
+extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG);	/* special */
 extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
 #endif

--- a/include/nc_tparm.h
+++ b/include/nc_tparm.h
@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2006,2010 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2006-2010,2012 Free Software Foundation, Inc.              *
 *                                                                          *
 * Permission is hereby granted, free of charge, to any person obtaining a  *
 * copy of this software and associated documentation files (the            *
@ -30,7 +30,7 @@
 *  Author: Thomas E. Dickey                        2006                    *
 ****************************************************************************/

-/* $Id: nc_tparm.h,v 1.5 2010/12/25 20:27:22 tom Exp $ */
+/* $Id: nc_tparm.h,v 1.6 2012/02/18 21:34:42 tom Exp $ */

 #ifndef NC_TPARM_included
 #define NC_TPARM_included 1
@ -40,8 +40,12 @@
 * assumption of the varargs code.
 */
 #ifndef TPARM_ARG
+#ifdef NCURSES_TPARM_ARG
+#define TPARM_ARG NCURSES_TPARM_ARG
+#else
 #define TPARM_ARG long
 #endif
+#endif /* TPARAM_ARG */

 #define TPARM_N(n) (TPARM_ARG)(n)

--- a/include/tic.h
+++ b/include/tic.h
@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
 *                                                                          *
 * Permission is hereby granted, free of charge, to any person obtaining a  *
 * copy of this software and associated documentation files (the            *
@ -33,14 +33,14 @@
 ****************************************************************************/

 /*
- * $Id: tic.h,v 1.67 2011/10/08 21:00:50 tom Exp $
+ * $Id: tic.h,v 1.68 2012/02/18 20:09:19 tom Exp $
 *	tic.h - Global variables and structures for the terminfo
 *			compiler.
 */

 #ifndef __TIC_H
 #define __TIC_H
-
+/* *INDENT-OFF* */
 #ifdef __cplusplus
 extern "C" {
 #endif
@ -248,6 +248,8 @@ extern NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool);
 #define TERMINFO "/usr/share/terminfo"
 #endif

+#ifdef NCURSES_TERM_ENTRY_H_incl
+
 /* access.c */
 extern NCURSES_EXPORT(unsigned) _nc_pathlast (const char *);
 extern NCURSES_EXPORT(bool) _nc_is_abs_path (const char *);
@ -323,8 +325,11 @@ extern NCURSES_EXPORT(void) _nc_last_db(void);
 /* write_entry.c */
 extern NCURSES_EXPORT(int) _nc_tic_written (void);

+#endif /* NCURSES_TERM_ENTRY_H_incl */
+
 #ifdef __cplusplus
 }
 #endif

+/* *INDENT-ON* */
 #endif /* __TIC_H */
--- a/ncurses/tinfo/make_hash.c
+++ b/ncurses/tinfo/make_hash.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
 *                                                                          *
 * Permission is hereby granted, free of charge, to any person obtaining a  *
 * copy of this software and associated documentation files (the            *
@ -39,13 +39,12 @@

 #include <build.priv.h>

-#include <term_entry.h>
 #include <tic.h>
 #include <hashsize.h>

 #include <ctype.h>

-MODULE_ID("$Id: make_hash.c,v 1.4 2011/10/08 21:11:54 tom Exp $")
+MODULE_ID("$Id: make_hash.c,v 1.6 2012/02/18 20:04:39 tom Exp $")

 /*
 *	_nc_make_hash_table()
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2008-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 2008-2011,2012 Free Software Foundation, Inc.              *
 *                                                                          *
 * Permission is hereby granted, free of charge, to any person obtaining a  *
 * copy of this software and associated documentation files (the            *
@ -50,7 +50,7 @@
 # endif
 #endif

-MODULE_ID("$Id: tinfo_driver.c,v 1.17 2011/12/17 20:40:33 tom Exp $")
+MODULE_ID("$Id: tinfo_driver.c,v 1.18 2012/02/18 20:34:55 tom Exp $")

 /*
 * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@ -93,7 +93,7 @@ NCURSES_EXPORT_VAR(int) COLORS = 0;

 #define TCBMAGIC NCDRV_MAGIC(NCDRV_TINFO)
 #define AssertTCB() assert(TCB!=0 && TCB->magic==TCBMAGIC)
-#define SetSP() assert(TCB->csp!=0); sp = TCB->csp
+#define SetSP() assert(TCB->csp!=0); sp = TCB->csp; (void) sp

 /*
 * This routine needs to do all the work to make curscr look
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@ -75,7 +75,7 @@
 #endif
 #undef CUR

-MODULE_ID("$Id: lib_twait.c,v 1.63 2012/01/21 19:21:29 KO.Myung-Hun Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.64 2012/02/18 20:32:55 tom Exp $")

 static long
 _nc_gettime(TimeType * t0, int first)
@ -218,6 +218,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
    starttime = _nc_gettime(&t0, TRUE);

    count = 0;
+    (void) count;

 #ifdef NCURSES_WGETCH_EVENTS
    if ((mode & TW_EVENT) && evl)
--- a/ncurses/win32con/win_driver.c
+++ b/ncurses/win32con/win_driver.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
 *                                                                          *
 * Permission is hereby granted, free of charge, to any person obtaining a  *
 * copy of this software and associated documentation files (the            *
@ -28,7 +28,6 @@

 /****************************************************************************
 *  Author: Juergen Pfeifer                                                 *
- *                                                                          *
 ****************************************************************************/

 /*
@ -39,12 +38,12 @@
 #include <curses.priv.h>
 #define CUR my_term.type.

-MODULE_ID("$Id: win_driver.c,v 1.10 2010/12/25 19:28:21 tom Exp $")
+MODULE_ID("$Id: win_driver.c,v 1.11 2012/02/18 20:28:25 tom Exp $")

 #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE)

 #define AssertTCB() assert(TCB!=0 && TCB->magic==WINMAGIC)
-#define SetSP() assert(TCB->csp!=0); sp = TCB->csp
+#define SetSP() assert(TCB->csp!=0); sp = TCB->csp; (void) sp

 #define GenMap(vKey,key) MAKELONG(key, vKey)

@ -308,7 +307,7 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB,

 static int
 drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB,
-		bool beepFlag GCC_UNUSED)
+		int beepFlag GCC_UNUSED)
 {
    SCREEN *sp;
    int res = ERR;
@ -348,7 +347,7 @@ drv_defaultcolors(TERMINAL_CONTROL_BLOCK * TCB,

 static void
 drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB,
-	     bool fore,
+	     int fore,
 	     int color,
 	     int (*outc) (SCREEN *, int) GCC_UNUSED)
 {
@ -412,7 +411,7 @@ drv_setsize(TERMINAL_CONTROL_BLOCK * TCB GCC_UNUSED,
 }

 static int
-drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, bool setFlag, TTY * buf)
+drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, int setFlag, TTY * buf)
 {
    DWORD dwFlag = 0;
    tcflag_t iflag;
@ -479,7 +478,7 @@ drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, bool setFlag, TTY * buf)
 }

 static int
-drv_mode(TERMINAL_CONTROL_BLOCK * TCB, bool progFlag, bool defFlag)
+drv_mode(TERMINAL_CONTROL_BLOCK * TCB, int progFlag, int defFlag)
 {
    SCREEN *sp;
    TERMINAL *_term = (TERMINAL *) TCB;
@ -674,9 +673,9 @@ drv_init(TERMINAL_CONTROL_BLOCK * TCB)

 static void
 drv_initpair(TERMINAL_CONTROL_BLOCK * TCB,
-	     short pair,
-	     short f,
-	     short b)
+	     int pair,
+	     int f,
+	     int b)
 {
    SCREEN *sp;

@ -691,10 +690,10 @@ drv_initpair(TERMINAL_CONTROL_BLOCK * TCB,

 static void
 drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB,
-	      short color GCC_UNUSED,
-	      short r GCC_UNUSED,
-	      short g GCC_UNUSED,
-	      short b GCC_UNUSED)
+	      int color GCC_UNUSED,
+	      int r GCC_UNUSED,
+	      int g GCC_UNUSED,
+	      int b GCC_UNUSED)
 {
    SCREEN *sp;

@ -704,9 +703,9 @@ drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB,

 static void
 drv_do_color(TERMINAL_CONTROL_BLOCK * TCB,
-	     short old_pair GCC_UNUSED,
-	     short pair GCC_UNUSED,
-	     bool reverse GCC_UNUSED,
+	     int old_pair GCC_UNUSED,
+	     int pair GCC_UNUSED,
+	     int reverse GCC_UNUSED,
 	     int (*outc) (SCREEN *, int) GCC_UNUSED
 )
 {
@ -778,7 +777,7 @@ drv_hwlabel(TERMINAL_CONTROL_BLOCK * TCB,

 static void
 drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB,
-		 bool OnFlag GCC_UNUSED)
+		 int OnFlag GCC_UNUSED)
 {
    SCREEN *sp;

@ -1080,7 +1079,6 @@ drv_read(TERMINAL_CONTROL_BLOCK * TCB, int *buf)
    BOOL b;
    DWORD nRead;
    WORD vk;
-    WORD sc;

    AssertTCB();
    assert(buf);
@ -1096,7 +1094,6 @@ drv_read(TERMINAL_CONTROL_BLOCK * TCB, int *buf)
 		    continue;
 		*buf = (int) inp_rec.Event.KeyEvent.uChar.AsciiChar;
 		vk = inp_rec.Event.KeyEvent.wVirtualKeyCode;
-		sc = inp_rec.Event.KeyEvent.wVirtualScanCode;
 		if (*buf == 0) {
 		    if (sp->_keypad_on) {
 			*buf = MapKey(TCB, vk);
@ -1157,7 +1154,7 @@ drv_kyExist(TERMINAL_CONTROL_BLOCK * TCB, int keycode)
 }

 static int
-drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool flag GCC_UNUSED)
+drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, int flag GCC_UNUSED)
 {
    SCREEN *sp;
    int code = ERR;
@ -1172,7 +1169,7 @@ drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool flag GCC_UNUSED)
 }

 static int
-drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int keycode, bool flag)
+drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int keycode, int flag)
 {
    int code = ERR;
    SCREEN *sp;
--- a/progs/tput.c
+++ b/progs/tput.c
@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
 *                                                                          *
 * Permission is hereby granted, free of charge, to any person obtaining a  *
 * copy of this software and associated documentation files (the            *
@ -47,7 +47,7 @@
 #endif
 #include <transform.h>

-MODULE_ID("$Id: tput.c,v 1.46 2010/01/09 16:53:24 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.48 2012/02/18 21:51:17 tom Exp $")

 #define PUTS(s)		fputs(s, stdout)
 #define PUTCHAR(c)	putchar(c)
@ -94,9 +94,6 @@ check_aliases(const char *name)
 * Lookup the type of call we should make to tparm().  This ignores the actual
 * terminfo capability (bad, because it is not extensible), but makes this
 * code portable to platforms where sizeof(int) != sizeof(char *).
- *
- * FIXME: If we want extensibility, analyze the capability string as we do
- * in tparm() to decide how to parse the varargs list.
 */
 static TParams
 tparm_type(const char *name)
@ -338,7 +335,7 @@ tput(int argc, char *argv[])
 	    case Numbers:
 	    default:
 		(void) _nc_tparm_analyze(s, p_is_s, &popcount);
-#define myParam(n) (p_is_s[n - 1] != 0 ? ((long) strings[n]) : numbers[n])
+#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n])
 		s = TPARM_9(s,
 			    myParam(1),
 			    myParam(2),