[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_draw.cpp,1.3,1.4 driver96.h,1.10,1.11 render.cpp,1.4,1.5 sprite.cpp,1.2,1.3

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv22682/driver

Modified Files:
	d_draw.cpp driver96.h render.cpp sprite.cpp 
Log Message:
substitute long int for LARGE_INTEGER

Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- d_draw.cpp	28 Jul 2003 03:12:49 -0000	1.3
+++ d_draw.cpp	28 Jul 2003 08:08:42 -0000	1.4
@@ -239,7 +239,7 @@
     DDSCAPS             ddscaps;
     HRESULT             hr;
 	DDCAPS				helCaps;
-	LARGE_INTEGER timerFrequency;
+	long int timerFrequency;
 	int32 capsError = 0;
 
 

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- driver96.h	28 Jul 2003 08:04:03 -0000	1.10
+++ driver96.h	28 Jul 2003 08:08:42 -0000	1.11
@@ -1255,12 +1255,6 @@
 #define TRUE 1
 #define FALSE 0
 
-#ifdef WIN32
-#undef LARGE_INTEGER
-#endif
-
-typedef long int LARGE_INTEGER;
-
 //
 //	Structure definitions
 //	---------------------
@@ -1656,7 +1650,7 @@
 extern uint8	palCopy[256][4];	// Current palette.
 //-----------------------------------------------------------------------------
 
-extern LARGE_INTEGER myTimers[10][2];
+extern long int myTimers[10][2];
 
 
 #ifdef __cplusplus

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- render.cpp	28 Jul 2003 07:47:21 -0000	1.4
+++ render.cpp	28 Jul 2003 08:08:42 -0000	1.5
@@ -613,7 +613,7 @@
 
 #if PROFILING == 1
 
-	LARGE_INTEGER startTime, endTime;
+	long int startTime, endTime;
 
 	QueryPerformanceCounter(&startTime);
 
@@ -1005,8 +1005,8 @@
 	HRESULT			hr;
 
 #if PROFILING == 1
-	static LARGE_INTEGER	endTime;
-	LARGE_INTEGER			startTime;
+	static long int	endTime;
+	long int	startTime;
 	int32					lastEndTime, profileTotalTime;
 #endif
 

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/sprite.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sprite.cpp	28 Jul 2003 03:12:49 -0000	1.2
+++ sprite.cpp	28 Jul 2003 08:08:42 -0000	1.3
@@ -282,7 +282,7 @@
 
 
 #define DEBUG_TIMING 0
-//LARGE_INTEGER myTimers[10][2];
+//long int myTimers[10][2];
 
 
 char shitColourTable[1024];
@@ -354,7 +354,7 @@
 	int32 rv;
 
 #if PROFILING == 1
-	LARGE_INTEGER startTime, endTime;
+	long int startTime, endTime;
 	QueryPerformanceCounter(&startTime);
 #endif
 
@@ -464,7 +464,7 @@
 	int32 rv;
 
 #if PROFILING == 1
-	LARGE_INTEGER startTime, endTime;
+	long int startTime, endTime;
 	QueryPerformanceCounter(&startTime);
 #endif
 
@@ -1499,7 +1499,7 @@
 /*
 
 #if PROFILING == 1
-	LARGE_INTEGER startTime, endTime;
+	long int startTime, endTime;
 
 	QueryPerformanceCounter(&startTime);
 #endif