snapshot of project "lynx", label v2-8-9dev_13a

15 files changed, 39 insertions, 36 deletions

diff --git a/CHANGES b/CHANGES
index 1118826b..efa373df 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,11 @@
--- $LynxId: CHANGES,v 1.889 2017/04/29 14:43:40 tom Exp $
+-- $LynxId: CHANGES,v 1.891 2017/04/30 17:54:33 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2017-04-30 (2.8.9dev.14)
+* compiler-warning fixes for c99 on OSX -TD
+
 2017-04-29 (2.8.9dev.13)
 * amend fix for Debian #841155, adding check for special case where the
   expected number of cells is zero (report by Larry Hynes) -TD
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 18788512..56e65d47 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.13) unstable; urgency=low
+lynx-dev (2.8.9dev.14) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Apr 2017 08:47:15 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 30 Apr 2017 12:02:52 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 08cb9c96..6615fc5d 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.34 2017/04/29 12:47:15 tom Exp $

+; $LynxId: lynx.nsi,v 1.35 2017/04/30 16:02:52 tom Exp $

 ; Script originally generated with the Venis Install Wizard, but customized.

 ; The Inno Setup script is preferred; but this can be built via cross-compiling.

 

@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"

 !define VERSION_MAJOR "8"

 !define VERSION_MINOR "9"

-!define VERSION_LEVEL "1013"

-!define VERSION_PATCH "dev.13"

+!define VERSION_LEVEL "1014"

+!define VERSION_PATCH "dev.14"

 

 !define SUBKEY "Lynx"

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 1445aeb1..33db2f9c 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.40 2017/04/29 12:47:15 tom Exp $
+# $LynxId: lynx.spec,v 1.41 2017/04/30 16:02:52 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.13
+Release: dev.14
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index a2b5727d..211413d9 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.

 

 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$

-#define LYNX_VERSION "2.8.9dev.13"

+#define LYNX_VERSION "2.8.9dev.14"

 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.9"

diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index f1648712..87de04b9 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.137 2017/01/02 02:11:14 tom Exp $
+ * $LynxId: HTTCP.c,v 1.138 2017/04/30 17:52:00 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -389,7 +389,7 @@ static void dump_hostent(const char *msgprefix,
 
 	CTRACE((tfp, "%s: %p ", msgprefix, (const void *) phost));
 	if (phost) {
-	    CTRACE((tfp, "{ h_name = %p", phost->h_name));
+	    CTRACE((tfp, "{ h_name = %p", (void *) phost->h_name));
 	    if (phost->h_name) {
 		CTRACE((tfp, " \"%s\",", phost->h_name));
 	    } else {
@@ -401,7 +401,7 @@ static void dump_hostent(const char *msgprefix,
 		for (pcnt = phost->h_aliases; *pcnt; pcnt++) {
 		    CTRACE((tfp, "%s %p \"%s\"",
 			    (pcnt == phost->h_aliases ? " " : ", "),
-			    *pcnt, *pcnt));
+			    (void *) *pcnt, *pcnt));
 		}
 		CTRACE((tfp, "%s0x0 },\n\t",
 			(*phost->h_aliases ? ", " : " ")));
@@ -416,7 +416,7 @@ static void dump_hostent(const char *msgprefix,
 		for (pcnt = phost->h_addr_list; *pcnt; pcnt++) {
 		    CTRACE((tfp, "%s %p",
 			    (pcnt == phost->h_addr_list ? "" : ","),
-			    *pcnt));
+			    (void *) *pcnt));
 		    for (i = 0; i < phost->h_length; i++) {
 			CTRACE((tfp, "%s%d%s", (i == 0 ? " \"" : "."),
 				(int) *((unsigned char *) (*pcnt) + i),
diff --git a/configure b/configure
index e1d071d5..ca3203f1 100755
--- a/configure
+++ b/configure
@@ -1274,7 +1274,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.13
+VERSION=2.8.9dev.14
 
 echo "$as_me:1279: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index 6f873236..df394ff9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.287 2017/04/29 14:49:46 tom Exp $
+dnl $LynxId: configure.in,v 1.288 2017/04/30 16:02:52 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.9dev.13)
+AC_REVISION(2.8.9dev.14)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.13
+VERSION=2.8.9dev.14
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index e2897870..a1568be6 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.280 2017/04/29 12:47:15 tom Exp $
+# $LynxId: lynx.cfg,v 1.281 2017/04/30 16:02:52 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.9dev.13"
+#PRCS LYNX_VERSION "2.8.9dev.14"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
+#PRCS LYNX_DATE "Sun, 30 Apr 2017 12:02:52 -0400"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
diff --git a/makefile.in b/makefile.in
index 705cb53d..74adb01e 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.160 2017/04/29 12:47:15 tom Exp $
+# $LynxId: makefile.in,v 1.161 2017/04/30 16:02:52 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -46,7 +46,7 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.9dev.13
+LYNX_VERSION	= 2.8.9dev.14
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index 6f04ea0c..5356caa8 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFWriter.c,v 1.111 2017/02/11 00:28:32 tom Exp $
+ * $LynxId: HTFWriter.c,v 1.112 2017/04/30 17:55:13 tom Exp $
  *
  *		FILE WRITER				HTFWrite.h
  *		===========
@@ -173,7 +173,7 @@ static void decompress_gzip(HTStream *me)
 	    }
 	    gzclose(gzfp);
 	    LYCloseTempFP(fp);
-	    CTRACE((tfp, "...decompress %ld to %ld\n",
+	    CTRACE((tfp, "...decompress %" PRI_off_t " to %ld\n",
 		    me->anchor->actual_length,
 		    actual));
 	    if (success) {
diff --git a/src/HTML.c b/src/HTML.c
index e74d2390..2053e53f 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTML.c,v 1.168 2016/11/24 18:18:18 tom Exp $
+ * $LynxId: HTML.c,v 1.170 2017/04/30 18:45:06 tom Exp $
  *
  *		Structured stream to Rich hypertext converter
  *		============================================
@@ -4717,7 +4717,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 	    }
 	    CTRACE((tfp, "2.Ok, we're trying type=[%s] (present=%p)\n",
 		    NONNULL(I.type),
-		    present));
+		    (const void *) present));
 	    /* text+file don't go in here */
 	    if ((UseALTasVALUE == TRUE) ||
 		(present && present[HTML_INPUT_VALUE] &&
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 63b73ece..28826a62 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.183 2017/03/18 21:42:48 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.184 2017/04/30 17:52:12 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -572,7 +572,7 @@ void wcurses_css(WINDOW * win, char *name,
 	if (tmpHash == NOSTYLE) {
 	    char *pclass = strrchr(name, '.');
 
-	    CTRACE2(TRACE_STYLE, (tfp, "undefined, trimming at %p\n", pclass));
+	    CTRACE2(TRACE_STYLE, (tfp, "undefined, trimming at %p\n", (void *) pclass));
 	    if (pclass)
 		*pclass = '\0';
 	    else
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index b3515772..4bcdaf94 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.28 2017/04/29 12:47:15 tom Exp $
+// $LynxId: LYIcon.rc,v 1.29 2017/04/30 16:02:52 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1013
-PRODUCTVERSION 2,8,9,1013
+FILEVERSION    2,8,9,1014
+PRODUCTVERSION 2,8,9,1014
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.1013"
+      VALUE "FileVersion",      "2.8.9.1014"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2017 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1013"
+      VALUE "ProductVersion",   "2.8.9.1014"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/userdefs.h b/userdefs.h
index 018f1a3a..9439a09e 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.325 2017/04/29 12:47:15 tom Exp $
+ * $LynxId: userdefs.h,v 1.326 2017/04/30 16:02:52 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1442,11 +1442,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9dev.13"
+#define LYNX_VERSION "2.8.9dev.14"
 #define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
+#define LYNX_DATE "Sun, 30 Apr 2017 12:02:52 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */