Re: lynx-dev DJGPP port [PATCH]

[Doug Kaufman]

On Mon, 7 Jan 2002, Gisle Vanem wrote:

> Once other diff; Including <conio.h> in lycurses.c causes a parse
> error. gettext is a function in <conio.h>

I see that there are more problems related to the two different conio.h
files, depending on whether or not the gettext package was installed
under DJGPP. I think the following patch fixes the problem. conio.h
was needed only for clrscr(). A similar function ScreenClear uses
headers from pc.h instead and avoids the need for conio.h.

> --- ./lynx285.d7/installa   Wed Jan  2 01:30:08 2002
> +++ ./installa        Mon Jan  7 18:16:38 2002
> @@ -866,7 +866,7 @@
>       
>      +void sig_handler_watt (int sig)
>      +{
> -    +        sig_handler (int sig);
> +    +   sig_handler (sig);
>      +}
>      +
>       /*

Sorry I let that obvious error creep into the patch. I had it corrected
before I compiled, but put the wrong line in the patch I submitted.
Thanks for noting and fixing it.

                              Doug


--- lynx2.8.5dev.7/lynx2-8-5/src/LYCurses.c.orig        Wed Jan  2 01:30:08 2002
+++ lynx2.8.5dev.7/lynx2-8-5/src/LYCurses.c     Wed Jan  9 18:26:02 2002
@@ -1,17 +1,6 @@
 #include <HTUtils.h>
 #include <HTAlert.h>
 
-#ifdef __DJGPP__
-#include <conio.h>
-/* The conio.h distributed with GNU gettext package may redefine gettext() to
- * _conio_gettext().  Restore our definition.
- */
-#ifndef HAVE_GETTEXT
-#undef gettext
-#define gettext(s) s
-#endif /* HAVE_GETTEXT */
-#endif /* __DJGPP__ */
-
 #include <LYCurses.h>
 #include <LYStyle.h>
 #include <LYUtils.h>
@@ -1263,7 +1252,11 @@
 #endif /* WATT32 */
 #endif /* __DJGPP__ */
 #if defined(DOSPATH) && !(defined(USE_SLANG) || _WIN_CC)
+#ifdef __DJGPP__
+    ScreenClear();
+#else
     clrscr();
+#endif /* __DJGPP__ */
 #else
 
     /*
__ 
Doug Kaufman
Internet: address@hidden


; To UNSUBSCRIBE: Send "unsubscribe lynx-dev" to address@hidden