diff options
| author | Jonathan Gray | 2003-07-28 08:08:42 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-07-28 08:08:42 +0000 |
| commit | 84bccaa83b996ef49fbedf6bb52bb64e9f3c5fd4 (patch) | |
| tree | 52d9b492f2c3c8e02b80a575d71afb3cbfdc53bb | |
| parent | 98b1a0d7ff2d5c4ff853f3e064d549ec558b36d1 (diff) | |
| download | scummvm-rg350-84bccaa83b996ef49fbedf6bb52bb64e9f3c5fd4.tar.gz scummvm-rg350-84bccaa83b996ef49fbedf6bb52bb64e9f3c5fd4.tar.bz2 scummvm-rg350-84bccaa83b996ef49fbedf6bb52bb64e9f3c5fd4.zip | |
substitute long int for LARGE_INTEGER
svn-id: r9236
| -rw-r--r-- | sword2/driver/d_draw.cpp | 2 | ||||
| -rw-r--r-- | sword2/driver/driver96.h | 8 | ||||
| -rw-r--r-- | sword2/driver/render.cpp | 6 | ||||
| -rw-r--r-- | sword2/driver/sprite.cpp | 8 |
4 files changed, 9 insertions, 15 deletions
diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp index 26cf7a93b1..8971a79174 100644 --- a/sword2/driver/d_draw.cpp +++ b/sword2/driver/d_draw.cpp @@ -239,7 +239,7 @@ int32 InitialiseDisplay(int16 width, int16 height, int16 colourDepth, int32 wind DDSCAPS ddscaps; HRESULT hr; DDCAPS helCaps; - LARGE_INTEGER timerFrequency; + long int timerFrequency; int32 capsError = 0; diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h index 0b222fc5b3..feafecd619 100644 --- a/sword2/driver/driver96.h +++ b/sword2/driver/driver96.h @@ -1255,12 +1255,6 @@ typedef int BOOL; #define TRUE 1 #define FALSE 0 -#ifdef WIN32 -#undef LARGE_INTEGER -#endif - -typedef long int LARGE_INTEGER; - // // Structure definitions // --------------------- @@ -1656,7 +1650,7 @@ extern int32 renderCaps; // Flags which determine how to render the scene. extern uint8 palCopy[256][4]; // Current palette. //----------------------------------------------------------------------------- -extern LARGE_INTEGER myTimers[10][2]; +extern long int myTimers[10][2]; #ifdef __cplusplus diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp index 72a39d9fd2..a7ccabdc61 100644 --- a/sword2/driver/render.cpp +++ b/sword2/driver/render.cpp @@ -613,7 +613,7 @@ int32 RenderParallax(_parallax *p, int16 layer) #if PROFILING == 1 - LARGE_INTEGER startTime, endTime; + long int startTime, endTime; QueryPerformanceCounter(&startTime); @@ -1005,8 +1005,8 @@ int32 CopyScreenBuffer(void) HRESULT hr; #if PROFILING == 1 - static LARGE_INTEGER endTime; - LARGE_INTEGER startTime; + static long int endTime; + long int startTime; int32 lastEndTime, profileTotalTime; #endif diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp index 5824b0c58e..fec8bf3292 100644 --- a/sword2/driver/sprite.cpp +++ b/sword2/driver/sprite.cpp @@ -282,7 +282,7 @@ extern int32 profileDecompression; #define DEBUG_TIMING 0 -//LARGE_INTEGER myTimers[10][2]; +//long int myTimers[10][2]; char shitColourTable[1024]; @@ -354,7 +354,7 @@ int32 DecompressRLE256(uint8 *dest, uint8 *source, int32 decompSize) int32 rv; #if PROFILING == 1 - LARGE_INTEGER startTime, endTime; + long int startTime, endTime; QueryPerformanceCounter(&startTime); #endif @@ -464,7 +464,7 @@ int32 DecompressRLE16(uint8 *dest, uint8 *source, int32 decompSize, uint8 *colTa int32 rv; #if PROFILING == 1 - LARGE_INTEGER startTime, endTime; + long int startTime, endTime; QueryPerformanceCounter(&startTime); #endif @@ -1499,7 +1499,7 @@ int32 DrawSprite(_spriteInfo *s) /* #if PROFILING == 1 - LARGE_INTEGER startTime, endTime; + long int startTime, endTime; QueryPerformanceCounter(&startTime); #endif |