lynx-dev dev.5 - lost patch

[Leonid Pauzner]

This patch was lost from dev.5 integration

(first part is CJK-specific and should be ifdef'ed with CJK_EX
instead of SH_EX (please undo some dev.5 LYMainLoop.c changes near the top);
the second and third parts are required for building with DOSPATH and SH_EX
but without WIN_EX.)

This is an attempt to make parts from Hiroyuki code work on other platforms
than Win32 (originally, all symbols SH_EXE, CJK_EX, WIN_EX, ... were defined
but we may want to buld lynx on a different system using one of those above).

There are other inconsistencies, such as including header files with _WIN_CC
but actually use them (if any) with WIN_EX...



30-Jul-99 02:57 Leonid Pauzner wrote:
> To: address@hidden
> Message-Id: <address@hidden>
> From: "Leonid Pauzner" <address@hidden>
> Date: Fri, 30 Jul 1999 02:57:45 +0400 (MSD)
> Subject: lynx-dev SH_EX fixes


I've build DJGPP lynx with SH_EX
but without CJK_EX (and without WIN_EX).

In order to build the following fixes required:


diff -u old/lymainlo.c ./lymainlo.c
--- old/lymainlo.c      Wed Jul 14 09:25:26 1999
+++ ./lymainlo.c        Fri Jul 30 02:39:28 1999
@@ -117,7 +117,10 @@
 #endif
 }

-/* 1998/10/30 (Fri) 10:06:47 */
+#endif /* CJK_EX */
+
+
+#ifdef SH_EX  /* 1998/10/30 (Fri) 10:06:47 */

 #define NOT_EQU        1

@@ -1556,7 +1559,7 @@

        }

-#if defined(SH_EX)     /* 1997/10/08 (Wed) 14:52:06 */
+#if defined(CJK_EX)    /* 1997/10/08 (Wed) 14:52:06 */
        if (nlinks > 0) {
            char *p = "LYNX (unknown link type)";

@@ -1622,7 +1625,7 @@
                set_ws_title(HTUnEscape(temp_buff));
            }
        }
-#endif /* SH_EX */
+#endif /* CJK_EX */

        /*
         *  Report unread or new mail, if appropriate.
@@ -2643,7 +2646,7 @@
            }
            break;

-#if defined(SH_EX) && defined(DOSPATH) /*1997/12/22 (Mon) 09:28:56 */
+#if defined(WIN_EX) && defined(SH_EX)  /*1997/12/22 (Mon) 09:28:56 */
        case LYK_TO_CLIPBOARD:  /* ^S */
            {
                if (put_clip(links[curdoc.link].lname) == 0) {
diff -u old/lyutils.c ./lyutils.c
--- old/lyutils.c       Fri Jul 16 20:55:38 1999
+++ ./lyutils.c Fri Jul 30 01:50:28 1999
@@ -7210,7 +7210,7 @@
 {
     char *shell = 0;
 #ifdef DOSPATH
-#ifdef SH_EX
+#ifdef WIN_EX
     shell = getenv("SHELL");
     if (shell) {
        if (access(shell, 0) != 0)
@@ -7230,7 +7230,7 @@
     if (shell == NULL) {
        shell = "command.com";
     }
-#endif /* SH_EX */
+#endif /* WIN_EX */
 #else
 #ifdef __EMX__
     if (getenv("SHELL") != NULL) {