lynx-dev Patch for DOS (dev.6)

[Doug Kaufman]

I compiled with -Wall and found several minor problems with missing
headers, etc. None of this seems to affect function, just makes for a
cleaner compile. I am pretty sure that I did the ifdef's properly, but
two of them are complex (otherwise unused variable warning).
                              Doug

--- lynx2-8-3/src/LYEdit.c      Wed Jul 14 09:25:26 1999
+++ lynx2-8-3/src/LYEdit.c.new  Sat Aug 14 18:16:16 1999
@@ -42,7 +42,10 @@
     char *format = "%s %s";
     char *command = NULL;
     char *filename = NULL;
-    char *colon, *number_sign;
+#if (!(defined(VMS) || defined(DOSPATH) || defined(__EMX__)) || defined(SH_EX))
+    char *colon;
+#endif
+    char *number_sign;
     char position[80];
     FILE *fp;
 #ifdef __CYGWIN__
--- lynx2-8-3/src/LYExtern.c    Wed Jul 14 09:25:26 1999
+++ lynx2-8-3/src/LYExtern.c.new        Sat Aug 14 18:02:38 1999
@@ -204,7 +204,9 @@
        if (externals2->command != 0
          && !strncasecomp(externals2->name, c, strlen(externals2->name)))
        {
+#if (!(defined(VMS) || defined(DOSPATH) || defined(__EMX__)) || 
defined(WIN_EX))
            char *cp;
+#endif
 
            if (no_externals && !externals2->always_enabled) {
                HTUserMsg(EXTERNALS_DISABLED);
--- lynx2-8-3/src/LYMain.c      Fri Aug 13 06:27:28 1999
+++ lynx2-8-3/src/LYMain.c.new  Sat Aug 14 17:47:08 1999
@@ -518,7 +518,7 @@
 #endif
 
 #ifdef __DJGPP__
-PRIVATE int LY_set_ctrl_break(int setting)
+PRIVATE void LY_set_ctrl_break(int setting)
 {
     (void)signal(SIGINT, (setting ? SIG_DFL : SIG_IGN));
     setcbrk(setting);
--- lynx2-8-3/src/LYUtils.c     Fri Aug 13 06:27:28 1999
+++ lynx2-8-3/src/LYUtils.c.new Sat Aug 14 16:10:14 1999
@@ -17,6 +17,11 @@
 #include <LYMainLoop.h>
 #include <LYKeymap.h>
 
+#ifdef __DJGPP__
+#include <go32.h>
+#include <sys/exceptn.h>
+#endif /* __DJGPP__ */
+
 #ifndef NO_GROUPS
 #include <HTFile.h>
 #endif
@@ -2388,7 +2393,7 @@
        && LYIsPathSep(path[2])));
 #else
     result = (LYIsPathSep(path[0]));
-#endif /* __DJGPP__ */
+#endif /* DOSPATH */
     return result;
 }
 
--- lynx2-8-3/WWW/Library/Implementation/www_tcp.h      Wed Jul 14 09:25:26 1999
+++ lynx2-8-3/WWW/Library/Implementation/www_tcp.h.new  Sat Aug 14 17:38:42 1999
@@ -496,7 +496,7 @@
 #define GLOBALREF extern
 #endif /* !GLOBALREF */
 
-#ifdef DJGPP
+#ifdef __DJGPP__
 #undef SELECT
 #define TCP_INCLUDES_DONE
 #define NO_IOCTL
@@ -504,6 +504,14 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <socket.h>
+#include <io.h>
+#ifdef WATT32
+#include <arpa/inet.h>
+#include <tcp.h>
+#ifdef word
+#undef word
+#endif /* word */
+#endif /* WATT32 */
 
 #undef NETWRITE
 #define NETWRITE write_s
@@ -513,7 +521,7 @@
 #define NETCLOSE close_s
 #ifndef WATT32
 #define getsockname getsockname_s
-#endif /* WATT32 */
+#endif /* !WATT32 */
 #ifdef HAVE_GETTEXT
 #define gettext gettext__
 #endif

__
Doug Kaufman
Internet: address@hidden (preferred)
          address@hidden