snapshot of project "lynx", label v2-8-8pre_1d

6 files changed, 22 insertions, 21 deletions

diff --git a/CHANGES b/CHANGES
index ff28c6fc..d3d62c53 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
--- $LynxId: CHANGES,v 1.705 2013/12/02 22:58:30 tom Exp $
+-- $LynxId: CHANGES,v 1.706 2013/12/09 11:21:42 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2013-12-02 (2.8.8pre.2)
+2013-12-09 (2.8.8pre.2)
+* allow fallback sleep() function to be used for MinGW -GV
 * remove special case in configure.in which added "-lcompat" to $LIBS
   for OpenBSD, MirBSD and EkkoBSD (Christian Weisberber, Thorsten Glaser).
 * build-fix for --disable-forms-options -TD
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index 105dde85..226aab55 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.128 2013/11/28 11:14:59 tom Exp $
+ * $LynxId: HTTCP.c,v 1.129 2013/12/07 15:36:55 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -1486,12 +1486,12 @@ static size_t fill_addrinfo(void **buffer,
 	 * packed, uninitialized gaps make it hard to analyse with valgrind.
 	 */
 	/* *INDENT-EQLS* */
-	actual->ai_flags = phost->ai_flags;
-	actual->ai_family = phost->ai_family;
+	actual->ai_flags    = phost->ai_flags;
+	actual->ai_family   = phost->ai_family;
 	actual->ai_socktype = phost->ai_socktype;
 	actual->ai_protocol = phost->ai_protocol;
-	actual->ai_addrlen = phost->ai_addrlen;
-	actual->ai_addr = (struct sockaddr *) (void *) heap;
+	actual->ai_addrlen  = phost->ai_addrlen;
+	actual->ai_addr     = (struct sockaddr *) (void *) heap;
 
 	MemCpy(heap, phost->ai_addr, phost->ai_addrlen);
 	heap += phost->ai_addrlen;
diff --git a/lib/dirent.c b/lib/dirent.c
index a143960f..603ece8d 100644
--- a/lib/dirent.c
+++ b/lib/dirent.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: dirent.c,v 1.5 2012/02/10 11:35:49 tom Exp $
+ * $LynxId: dirent.c,v 1.6 2013/12/07 13:46:58 tom Exp $
  *
  * dir.c for MS-DOS by Samuel Lam <skl@van-bc.UUCP>, June/87 
  */
@@ -28,13 +28,13 @@
 #endif
 
 #ifndef __GNUC__
-#pragma warning (disable : 4100) /* unreferenced formal parameter */
-#pragma warning (disable : 4127) /* conditional expression is constant */
-#pragma warning (disable : 4201) /* nameless struct/union */
-#pragma warning (disable : 4214) /* bit field types other than int */
-#pragma warning (disable : 4310) /* cast truncates constant value */
-#pragma warning (disable : 4514) /* unreferenced inline function has been removed */
-#pragma warning (disable : 4996) /* This function or variable may be unsafe. ... */
+#pragma warning (disable : 4100)	/* unreferenced formal parameter */
+#pragma warning (disable : 4127)	/* conditional expression is constant */
+#pragma warning (disable : 4201)	/* nameless struct/union */
+#pragma warning (disable : 4214)	/* bit field types other than int */
+#pragma warning (disable : 4310)	/* cast truncates constant value */
+#pragma warning (disable : 4514)	/* unreferenced inline function has been removed */
+#pragma warning (disable : 4996)	/* This function or variable may be unsafe. ... */
 #endif
 
 #include <windows.h>
diff --git a/src/LYForms.c b/src/LYForms.c
index 6c9e93e4..fa8000dd 100644
--- a/src/LYForms.c
+++ b/src/LYForms.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYForms.c,v 1.110 2013/10/13 18:39:48 tom Exp $ */
+/* $LynxId: LYForms.c,v 1.111 2013/12/07 13:46:58 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <HTTP.h>
@@ -23,7 +23,7 @@
 #if defined(VMS) && !defined(USE_SLANG)
 #define RepaintKey() 12		/* CTRL-L for repaint */
 #else
-#define RepaintKey() ((!enable_scrollback) ? 23 : 12) /* CTRL-W or CTRL-L */
+#define RepaintKey() ((!enable_scrollback) ? 23 : 12)	/* CTRL-W or CTRL-L */
 #endif /* VMS && !USE_SLANG */
 
 static int form_getstr(int cur,
diff --git a/src/LYLeaks.c b/src/LYLeaks.c
index 160bf463..f6c71748 100644
--- a/src/LYLeaks.c
+++ b/src/LYLeaks.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYLeaks.c,v 1.36 2012/02/10 00:33:39 tom Exp $
+ * $LynxId: LYLeaks.c,v 1.37 2013/12/07 13:46:58 tom Exp $
  *
  *	Copyright (c) 1994, University of Kansas, All Rights Reserved
  *	(this file was rewritten twice - 1998/1999 and 2003/2004)
@@ -912,7 +912,7 @@ void LYLeakSABCat(bstring **dest,
 	    t->str = (char *) LYLeakRealloc(t->str, length, cp_File, ssi_Line);
 	} else {
 	    if ((t = (bstring *) LYLeakCalloc(1, sizeof(bstring), cp_File,
-		ssi_Line)) == NULL)
+					      ssi_Line)) == NULL)
 		  outofmem(__FILE__, "HTSACat");
 
 	    assert(t != NULL);
diff --git a/src/LYUtils.c b/src/LYUtils.c
index cf549e62..e573ccab 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.262 2013/11/29 00:04:25 tom Exp $
+ * $LynxId: LYUtils.c,v 1.263 2013/12/09 11:21:42 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -4583,7 +4583,7 @@ int win32_check_interrupt(void)
     return FALSE;
 }
 
-#if !defined(__MINGW32__)
+#if !defined(sleep)
 void sleep(unsigned sec)
 {
     unsigned int i, j;