Start by removing all the ifdef'd DOS code in source and include files

Author: nbriggs

inc/bitblt.h

@@ -49,12 +49,7 @@ extern int DisplayRasterWidth;
 #define	MOUSEYH	((int)*EmMouseY68K + YDELTA)
 
 
-#ifdef DOS
-#define HideCursor { (currentdsp->mouse_invisible)(currentdsp, IOPage68K); }
-#define ShowCursor { (currentdsp->mouse_visible)(IOPage68K->dlmousex, \
-												  IOPage68K->dlmousey); }
-
-#elif defined(SUNDISPLAY) && defined(OLD_CURSOR)
+#if   defined(SUNDISPLAY) && defined(OLD_CURSOR)
 extern struct winlock DisplayLockArea;
 #define	HideCursor	\
 	ioctl( LispWindowFd, WINLOCKSCREEN, &DisplayLockArea)
@@ -82,14 +77,7 @@ extern DLword *EmCursorX68K,*EmCursorY68K;
 
 /* Macro for locking and unlocking screen to prevent multiple updates */
 
-#ifdef DOS
-#define LOCKSCREEN currentdsp->device.locked++;
-#define UNLOCKSCREEN currentdsp->device.locked--;
-
-#else
-
 #define LOCKSCREEN ScreenLocked = T;
 #define UNLOCKSCREEN ScreenLocked = NIL;
 
-#endif /* DOS */
 #endif /* BITBLT_H */

inc/devif.h

@@ -154,19 +154,6 @@ typedef struct
   {
     DevRec device;
     PFV device_event;		/* Event handler for the keyboard. */
-#ifdef DOS
-    u_char KeyMap[0x80];	/* The key translation table. Use the keycode you
-				   get from the keyboard as an index. The value
-				   gives the lispkeycode.*/
-    unsigned char lastbyte;	/* Last byte that we got from the keyboard. */
-    unsigned int keyeventsize;	/* The sizeof() one kbd event */
-    unsigned int maxkeyevent;	/* Offset to the end of the ringbuffer. */
-    int eurokbd;		/* Keep tabs of the euro-ness of the kbd */
-    PFV prev_handler;		/* The previous keyboard handler.
-				   Keep this around
-				   to restore when we exit Medley */
-    int	URaid;			/* Put this in a better place later.. /jarl */
-#endif /* DOS */
   } KbdInterfaceRec, *KbdInterface;
 
 
@@ -221,20 +208,7 @@ typedef struct
     unsigned long oldstate; /* Keep the old state around */
     unsigned long graphicsmode; /* Magic cookie used to set the state. */
     unsigned long numberofbanks;
-#ifdef DOS
-    unsigned long BytesPerLine;
-    unsigned long DisplayStartAddr;
-    unsigned long DisplaySegSize;
-    unsigned long DisplaySegMagnitude;
-    unsigned long LinesPerBank;
-    unsigned short LastLineLen[32];     /* length of last line fragment per bank */
-    unsigned short LinesInBank[32];     /* True # of full lines in this bank */
-					/* # of lines we can do with the full-line dumpline */
-					/* for sure. */
-    unsigned short LinesBeforeBank[32]; /* Scan lines before start of this bank. */
-
-    void (* SwitchBank)(); /* Method to switch the bank (see vesa standard) */
-#elif XWINDOW
+#if   XWINDOW
     char *identifier;
     int BitGravity;
     Display *display_id;

inc/dirdefs.h

@@ -1,9 +1,6 @@
 #ifndef DIRDEFS_H
 #define DIRDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-#ifdef DOS
-int make_old_version(char *old, char *file);
-#endif
 #ifdef FSDEBUG
 void print_finfo(FINFO *fp);
 #endif

inc/display.h

@@ -44,10 +44,6 @@ extern DLword *DISP_MAX_Address;
 #define DISPLAYBUFFER
 #endif /* XWINDOW */
 
-#ifdef DOS
-#define DISPLAYBUFFER
-#endif /* DOS */
-
 #ifdef DISPLAYBUFFER
 /************************************************************************/
 /*									*/

inc/dskdefs.h

@@ -1,11 +1,7 @@
 #ifndef DSKDEFS_H
 #define DSKDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-#ifdef DOS
-void separate_host(char *lfname, char *host, char *drive);
-#else
 void separate_host(char *lfname, char *host);
-#endif
 LispPTR COM_openfile(register LispPTR *args);
 LispPTR COM_closefile(register LispPTR *args);
 LispPTR DSK_getfilename(register LispPTR *args);

inc/kbdif.h

@@ -15,20 +15,12 @@
 
 typedef struct {
   u_char KeyMap[0x80];
-#ifdef DOS
-  u_char lastbyte;
-  void	(*prev_handler)();
-#endif /* DOS */
   void	(* sync_device)();	/* Make reality and emulator coincide with each other */
   void	(* enter_device)();
   void	(* exit_device)();
   void	(* device_event)();
   void	(* before_raid)();
   void	(* after_raid)();
   int	lispkeycode;
-#ifdef DOS
-  int	device_active;
-  int	device_locked;
-#endif /* DOS */
 } KbdInterfaceRec, *KbdInterface;
 #endif /* KBDIF_H */

inc/locfile.h

@@ -312,16 +312,8 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
  * They might be lost in the course of the conversion.
  *
  */
-#ifdef DOS
-
-/* DOS version of LispVersionToUnixVersion */
-/* * * * * This is done this way because DOS can't handle the non-DOS version -- */
-/* * * * * it gave "Too many characters in a character constant" errors!        */
-#include "lispver1.h"
-#else /* DOS */
 /* NON-DOS version of the macro LispVersionToUnixVersion */
 #include "lispver2.h"
-#endif /* DOS */
 
 
 /*		
@@ -501,13 +493,9 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
         (((varray)->version_no == LASTVERSIONARRAY)? 1 : 0)
 
 
-#ifdef DOS
-#define OnlyVersionlessP(varray) 0
-#else
-#define OnlyVersionlessP(varray)							 \
+#define OnlyVersionlessP(varray)							\
         (((varray)->version_no == 0 && ((varray) + 1)->version_no == LASTVERSIONARRAY) ? \
 	 1 : 0)
-#endif /* DOS */
 
 /* An argument of AddDotNoExtension must be LispVersion convention */
 /* Like "foo/fee.fee;3" or "/foo/foo;3" */
@@ -622,20 +610,12 @@ extern	int	errno;
 /*  DRIVESEP = OS-specific drive separator character. */
 /*    (only used with DOS as of 3/93)         */
 /********************************************************/
-#ifdef DOS
-#define DIRSEP '\\'
-#define DIRSEPSTR "\\"
-#define DRIVESEP ':'
-#define UNIXDIRSEP '/'
-#define MAXNAMLEN _MAX_PATH
-#else
 #define DIRSEPSTR "/"
 #define DIRSEP '/'
 #define UNIXDIRSEP '/'
 /* system includes may already define MAXNAMLEN */
 #if !defined(MAXNAMLEN)
 #define MAXNAMLEN NAME_MAX
 #endif
-#endif
 
 #endif /* LOCFILE_H */

inc/medleyfp.h

@@ -39,11 +39,6 @@ extern volatile sig_atomic_t FP_error;
 #define FPCLEAR         FP_error = 0;
 #define FPTEST(result)  FP_error
 
-#elif defined(DOS)
-#include <i32.h>
-#define FPCLEAR
-#define FPTEST(result) (_getrealerror() & ( I87_ZERO_DIVIDE | I87_OVERFLOW | I87_UNDERFLOW))
-
 #else
 #include <math.h>
 #define FPCLEAR

inc/ufsdefs.h

@@ -5,11 +5,7 @@ LispPTR UFS_getfilename(LispPTR *args);
 LispPTR UFS_deletefile(LispPTR *args);
 LispPTR UFS_renamefile(LispPTR *args);
 LispPTR UFS_directorynamep(LispPTR *args);
-#ifdef DOS
-int unixpathname(char *src, char *dst, int versionp, int genp, char *drive, int *extlenptr, char *rawname);
-#else
 int unixpathname(char *src, char *dst, int versionp, int genp);
-#endif
 int lisppathname(char *fullname, char *lispname, int dirp, int versionp);
 int quote_fname(char *file);
 int quote_fname_ufs(char *file);

inc/version.h

@@ -233,15 +233,7 @@ error Must specify RELEASE to build Medley.
 	/*							*/
 	/********************************************************/
 
-#ifdef DOS
-typedef unsigned char u_char;
-typedef unsigned long u_int;
-typedef unsigned short u_short;
-#undef UNALIGNED_FETCH_OK
-#define USHORT unsigned
-#else
 #define USHORT unsigned short
-#endif /* DOS */
 
 	/****************************************************************/
 	/* 	    End of architecture-specific flag settings		*/