From 4c71b4e1078ec8a8b4ffcaeaaf93c794813372af Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Wed, 14 Nov 2001 10:31:40 +0000
Subject: [PATCH] change __ENV_WINDOWS__ to __WINDOWS__, __ENV_MSDOS__ to
 __MSDOS__

---
 include/grdef.h | 9 ++++++---
 main/config.c   | 6 +++---
 misc/d_io.c     | 6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/grdef.h b/include/grdef.h
index 7bdd3700..9a36c0c3 100644
--- a/include/grdef.h
+++ b/include/grdef.h
@@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 /*
  * $Source: /cvs/cvsroot/d2x/include/grdef.h,v $
- * $Revision: 1.1.1.2 $
+ * $Revision: 1.2 $
  * $Author: bradleyb $
- * $Date: 2001-01-19 03:34:09 $
+ * $Date: 2001-11-14 10:31:40 $
  *
  * Internal definitions for graphics lib.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.1.1.2  2001/01/19 03:34:09  bradleyb
+ * Import of d2x-0.0.9-pre1
+ *
  * Revision 1.2  1999/11/20 10:05:16  donut
  * variable size menu patch from Jan Bobrowski.  Variable menu font size support and a bunch of fixes for menus that didn't work quite right, by me (MPM).
  *
@@ -100,7 +103,7 @@ void gr_linear_line( int x0, int y0, int x1, int y1);
 
 extern unsigned int Table8to32[256];
 
-#ifdef __ENV_DJGPP_
+#ifdef __DJGPP__
 extern unsigned char * gr_video_memory;
 #endif
 
diff --git a/main/config.c b/main/config.c
index 8da5cfb0..d3fa92fb 100644
--- a/main/config.c
+++ b/main/config.c
@@ -48,7 +48,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 
 #ifdef RCS
-static char rcsid[] = "$Id: config.c,v 1.4 2001-10-12 00:18:38 bradleyb Exp $";
+static char rcsid[] = "$Id: config.c,v 1.5 2001-11-14 10:31:40 bradleyb Exp $";
 #endif
 
 ubyte Config_digi_volume = 8;
@@ -58,7 +58,7 @@ ubyte Config_control_type = 0;
 ubyte Config_channels_reversed = 0;
 ubyte Config_joystick_sensitivity = 8;
 
-#ifdef __ENV_MSDOS__
+#ifdef __MSDOS__
 static char *digi_dev8_str = "DigiDeviceID8";
 static char *digi_dev16_str = "DigiDeviceID16";
 static char *digi_port_str = "DigiPort";
@@ -578,7 +578,7 @@ int WriteConfigFile()
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: config.c,v 1.4 2001-10-12 00:18:38 bradleyb Exp $";
+static char rcsid[] = "$Id: config.c,v 1.5 2001-11-14 10:31:40 bradleyb Exp $";
 #endif
 
 #define MAX_CTB_LEN	512
diff --git a/misc/d_io.c b/misc/d_io.c
index b23abec9..81771375 100644
--- a/misc/d_io.c
+++ b/misc/d_io.c
@@ -15,7 +15,7 @@
 #include "u_mem.h"
 //end addition -MM
 
-#ifdef __ENV_WINDOWS__
+#ifdef __WINDOWS__
 #include <windows.h>
 #define lseek(a,b,c) _lseek(a,b,c)
 #endif
@@ -38,10 +38,10 @@ long ffilelength(FILE *fh)
 
 unsigned long d_getdiskfree()
 {
-#ifdef __ENV_MSDOS__
+#ifdef __MSDOS__
   return getdiskfree();
 #else
-#ifdef __ENV_WINDOWS__
+#ifdef __WINDOWS__
 	ULONG cbCluster = 0;
 	ULONG cClusters = 0;
 
-- 
2.39.2