Re: lynx-dev (patch) simplify ifdefing with new USE_MOUSE symbol

[Leonid Pauzner]

2-Apr-2000 16:26 Leonid Pauzner wrote:
> * Revise windows makefiles: there was _both_ NCURSES and PDCURSES
>   symbols defined - leave only PDCURSES for now; add new symbols
>   - SOURCE_CACHE and USE_PRETTYSRC, remove obsolete EXP_CHARTRANS.


> There should not be any problem but please test,
> Windows people in particular.

I was trying to compile without NCURSES symbol defined on DJGPP
with pdcurses library. It appears that
 LYOptions.o(.text+0x5833):LYOptions.c: undefined reference to `LYsubwindow'
 LYForms.o(.text+0x14a0):LYForms.c: undefined reference to `LYsubwindow'
 collect2: ld returned 1 exit status
 make.exe: *** [lynx] Error 1

which means LYsubwindow() defined sometimes with NCURSES||PDCURSES
and sometimes with NCURSES...
I have no idea what should it be for pdcurses
(it worked for me both with/without LYsubwindow()),
I made it compatible with current state
so the patch supplied (please apply over my previous one).

I also found that no pdcurses.h file shipped with my pdcurses.a (DJGPP),
only curses.h, so I comment it out in LYCurses.h
but am not sure for other platforms. Proper ifdefing required.


diff -u old/lycurses.h ./lycurses.h
--- old/lycurses.h      Sun Apr  2 15:43:58 2000
+++ ./lycurses.h        Sun Apr  2 18:12:24 2000
@@ -110,8 +110,8 @@
 #  include <LYGCurses.h>
 # else
 #  ifdef PDCURSES      /* 1999/07/15 (Thu) 08:27:48 */
-#   include <pdcurses.h> /* for PDCurses */
-#  else
+//#   include <pdcurses.h> /* for PDCurses */
+//#  else
 #   include <curses.h>  /* everything else */
 #  endif /* not PDCURSES */
 # endif /* VMS && __GNUC__ */
diff -u old/lyforms.c ./lyforms.c
--- old/lyforms.c       Sun Apr  2 16:11:50 2000
+++ ./lyforms.c Sun Apr  2 18:03:42 2000
@@ -1857,7 +1857,7 @@
     }
 #ifndef USE_SLANG
     delwin(form_window);
-#if defined(NCURSES)
+#if defined(NCURSES) || defined(PDCURSES)
     LYsubwindow(0);
 #endif
 #endif /* !USE_SLANG */
diff -u old/lyoption.c ./lyoption.c
--- old/lyoption.c      Sun Apr  2 13:33:02 2000
+++ ./lyoption.c        Sun Apr  2 18:04:10 2000
@@ -3148,7 +3148,7 @@
 #ifndef USE_SLANG
     touchwin(stdscr);
     delwin(form_window);
-#ifdef NCURSES
+#if defined(NCURSES) || defined(PDCURSES)
     LYsubwindow(0);
 #endif
 #endif /* !USE_SLANG */
diff -u old/lystring.c ./lystring.c
--- old/lystring.c      Sun Apr  2 14:46:10 2000
+++ ./lystring.c        Sun Apr  2 18:15:54 2000
@@ -649,7 +649,7 @@
 #endif /* HAVE_KEYPAD */
 #endif /* !defined(GetChar) */

-#if defined(NCURSES)
+#if defined(NCURSES) || defined(PDCURSES)
 /*
  * Workaround a bug in ncurses order-of-refresh by setting a pointer to
  * the topmost window that should be displayed.
diff -u old/makefile.dos ./makefile.dos
--- old/makefile.dos    Mon Feb 14 20:07:40 2000
+++ ./makefile.dos      Sun Apr  2 18:09:38 2000
@@ -39,9 +39,9 @@
  -DEXP_ALT_BINDINGS \
  -DEXP_FILE_UPLOAD \
  -DEXP_PERSISTENT_COOKIES \
+ -DPDCURSES \
  -DFANCY_CURSES \
  -DHAVE_GETBKGD \
- -DNCURSES \
  -DNOUSERS \
  -DNO_CUSERID \
  -DNO_TTYTYPE \