Remove vestiges of old overlay source split

[trunk only]

win/tty/getline.c

@@ -13,9 +13,7 @@
 #include "wintty.h"
 #include "func_tab.h"
 
-#ifdef OVL1
 char morc = 0;	/* tell the outside world what char you chose */
-#endif /* OVL1 */
 STATIC_DCL boolean FDECL(ext_cmd_getlin_hook, (char *));
 
 typedef boolean FDECL((*getlin_hook_proc), (char *));
@@ -25,8 +23,6 @@ extern int NDECL(extcmd_via_menu);	/* cmd.c */
 
 extern char erase_char, kill_char;	/* from appropriate tty.c file */
 
-#ifdef OVL1
-
 /*
  * Read a line closed with '\n' into the array char bufp[BUFSZ].
  * (The '\n' is not stored. The string is closed with a '\0'.)
@@ -197,9 +193,6 @@ register const char *s;	/* chars allowed besides return */
 
 }
 
-#endif /* OVL1 */
-#ifdef OVL2
-
 /*
  * Implement extended command completion by using this hook into
  * tty_getlin.  Check the characters already typed, if they uniquely
@@ -277,8 +270,6 @@ tty_get_ext_cmd()
 	return i;
 }
 
-#endif /* OVL2 */
-
 #endif /* TTY_GRAPHICS */
 
 /*getline.c*/

win/tty/termcap.c

@@ -23,22 +23,18 @@ static char * FDECL(e_atr2str, (int));
 void FDECL(cmov, (int, int));
 void FDECL(nocmov, (int, int));
 #if defined(TEXTCOLOR) && defined(TERMLIB)
-# ifdef OVLB
-#  if !defined(UNIX) || !defined(TERMINFO)
-#   ifndef TOS
+# if !defined(UNIX) || !defined(TERMINFO)
+#  ifndef TOS
 static void FDECL(analyze_seq, (char *, int *, int *));
-#   endif
 #  endif
+# endif
 static void NDECL(init_hilite);
 static void NDECL(kill_hilite);
-# endif /* OVLB */
 #endif
 
-#ifdef OVLB
 	/* (see tcap.h) -- nh_CM, nh_ND, nh_CD, nh_HI,nh_HE, nh_US,nh_UE,
 				ul_hack */
 struct tc_lcl_data tc_lcl_data = { 0, 0, 0, 0,0, 0,0, FALSE };
-#endif /* OVLB */
 
 STATIC_VAR char *HO, *CL, *CE, *UP, *XD, *BC, *SO, *SE, *TI, *TE;
 STATIC_VAR char *VS, *VE;
@@ -48,18 +44,15 @@ STATIC_VAR char *MR;
 STATIC_VAR char *MB, *MH;
 STATIC_VAR char *MD;     /* may already be in use below */
 #endif
+
 #ifdef TERMLIB
 # ifdef TEXTCOLOR
 STATIC_VAR char *MD;
 # endif
 STATIC_VAR int SG;
-#ifdef OVLB
 STATIC_OVL char PC = '\0';
-#else /* OVLB */
-STATIC_DCL char PC;
-#endif /* OVLB */
 STATIC_VAR char tbuf[512];
-#endif
+#endif /*TERMLIB*/
 
 #ifdef TEXTCOLOR
 # ifdef TOS
@@ -69,10 +62,8 @@ char NEARDATA *hilites[CLR_MAX]; /* terminal escapes for the various colors */
 # endif
 #endif
 
-#ifdef OVLB
 static char *KS = (char *)0, *KE = (char *)0;	/* keypad sequences */
 static char nullstr[] = "";
-#endif /* OVLB */
 
 #if defined(ASCIIGRAPH) && !defined(NO_TERMS)
 extern boolean HE_resets_AS;
@@ -87,8 +78,6 @@ STATIC_VAR char tgotobuf[20];
 # endif
 #endif /* TERMLIB */
 
-#ifdef OVLB
-
 void
 tty_startup(wid, hgt)
 int *wid, *hgt;
@@ -489,10 +478,7 @@ tty_end_screen()
 
 /* Cursor movements */
 
-#endif /* OVLB */
-
-#ifdef OVL0
-/* Note to OVLx tinkerers.  The placement of this overlay controls the location
+/* Note to overlay tinkerers.  The placement of this overlay controls the location
    of the function xputc().  This function is not currently in trampoli.[ch]
    files for what is deemed to be performance reasons.  If this define is moved
    and or xputc() is taken out of the ROOT overlay, then action must be taken
@@ -554,7 +540,7 @@ register int x, y;
 	ttyDisplay->curx = x;
 }
 
-/* See note at OVLx ifdef above.   xputc() is a special function. */
+/* See note above. xputc() is a special function. */
 void
 xputc(c)
 #if defined(apollo)
@@ -600,9 +586,6 @@ cl_end()
 	}
 }
 
-#endif /* OVL0 */
-#ifdef OVLB
-
 void
 clear_screen()
 {
@@ -615,9 +598,6 @@ clear_screen()
 	}
 }
 
-#endif /* OVLB */
-#ifdef OVL0
-
 void
 home()
 {
@@ -675,9 +655,6 @@ m_end()
 }
 #endif
 
-#endif /* OVL0 */
-#ifdef OVLB
-
 void
 backsp()
 {
@@ -692,9 +669,6 @@ tty_nhbell()
 	(void) fflush(stdout);
 }
 
-#endif /* OVLB */
-#ifdef OVL0
-
 #ifdef ASCIIGRAPH
 void
 graph_on() {
@@ -707,9 +681,6 @@ graph_off() {
 }
 #endif
 
-#endif /* OVL0 */
-#ifdef OVL1
-
 #if !defined(MICRO)
 # ifdef VMS
 static const short tmspc10[] = {		/* from termcap */
@@ -776,9 +747,6 @@ tty_delay_output()
 #endif /* MICRO */
 }
 
-#endif /* OVL1 */
-#ifdef OVLB
-
 void
 cl_eos()			/* free after Robert Viduya */
 {				/* must only be called with curx = 1 */
@@ -1175,8 +1143,6 @@ int color;
 
 #endif /* TEXTCOLOR */
 
-#endif /* OVLB */
-
 #endif /* TTY_GRAPHICS */
 
 /*termcap.c*/

win/tty/topl.c

@@ -19,8 +19,6 @@ STATIC_DCL void FDECL(topl_putsym, (CHAR_P));
 STATIC_DCL void NDECL(remember_topl);
 STATIC_DCL void FDECL(removetopl, (int));
 
-#ifdef OVLB
-
 int
 tty_doprev_message()
 {
@@ -117,9 +115,6 @@ tty_doprev_message()
     return 0;
 }
 
-#endif /* OVLB */
-#ifdef OVL1
-
 STATIC_OVL void
 redotoplin(str)
     const char *str;
@@ -169,9 +164,6 @@ const char *s;
     ttyDisplay->toplin = 1;
 }
 
-#endif /* OVL1 */
-#ifdef OVL2
-
 void
 more()
 {
@@ -451,9 +443,6 @@ char def;
 
 	return q;
 }
-
-#endif /* OVL2 */
-
 #endif /* TTY_GRAPHICS */
 
 /*topl.c*/

win/win32/winhack.c

@@ -33,12 +33,6 @@ typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
 
 #endif
 
-#ifdef OVL0
-#define SHARED_DCL
-#else
-#define SHARED_DCL extern
-#endif
-
 /* Minimal common control library version
 Version     _WIN_32IE   Platform/IE
 =======     =========   ===========