diff options
| author | Max Horn | 2009-02-15 21:27:42 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-15 21:27:42 +0000 |
| commit | e90eed4ff338f833067f28e0374d58ccfdf6cbf1 (patch) | |
| tree | b83cb7ece93b5b2697cae3ee39f11d7c460a8391 /engines/sci/gfx | |
| parent | 5417f6bacb73d5996b26229513c2ce01db27bf6a (diff) | |
| download | scummvm-rg350-e90eed4ff338f833067f28e0374d58ccfdf6cbf1.tar.gz scummvm-rg350-e90eed4ff338f833067f28e0374d58ccfdf6cbf1.tar.bz2 scummvm-rg350-e90eed4ff338f833067f28e0374d58ccfdf6cbf1.zip | |
SCI: Changed _WIN32 -> WIN32; _DREAMCAST -> __DC__; removed _DOS stuff
svn-id: r38305
Diffstat (limited to 'engines/sci/gfx')
| -rw-r--r-- | engines/sci/gfx/gfx_crossblit.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_pixmap_scale.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_test.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_tools.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gfx/resource/sci_view_0.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/gfx/gfx_crossblit.cpp b/engines/sci/gfx/gfx_crossblit.cpp index 89be4b911a..03ddb7642d 100644 --- a/engines/sci/gfx/gfx_crossblit.cpp +++ b/engines/sci/gfx/gfx_crossblit.cpp @@ -42,7 +42,7 @@ /* t on: use fast code */ /* y on: suppress creation of frame pointers on stack */ /* s off: disable minimize size code */ -#ifdef _WIN32 +#ifdef WIN32 # include <memory.h> # ifndef SATISFY_PURIFY # pragma optimize( "s", off ) @@ -104,6 +104,6 @@ static void FUNCTION_NAME(byte *dest, byte *src, int bytes_per_dest_line, int by /* reset to original optimisations for Win32: */ /* (does not reset intrinsics) */ -#ifdef _WIN32 +#ifdef WIN32 # pragma optimize( "", on ) #endif diff --git a/engines/sci/gfx/gfx_pixmap_scale.cpp b/engines/sci/gfx/gfx_pixmap_scale.cpp index 0edd0365c8..006eef09b0 100644 --- a/engines/sci/gfx/gfx_pixmap_scale.cpp +++ b/engines/sci/gfx/gfx_pixmap_scale.cpp @@ -9,7 +9,7 @@ /* t on: use fast code */ /* y on: suppress creation of frame pointers on stack */ /* s off: disable minimize size code */ -#ifdef _WIN32 +#ifdef WIN32 # include <memory.h> # ifndef SATISFY_PURIFY # pragma optimize( "s", off ) @@ -492,6 +492,6 @@ FUNCNAME_TRILINEAR(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale) /* reset to original optimisations for Win32: */ /* (does not reset intrinsics) */ -#ifdef _WIN32 +#ifdef WIN32 # pragma optimize( "", on ) #endif diff --git a/engines/sci/gfx/gfx_test.cpp b/engines/sci/gfx/gfx_test.cpp index 0170364b8d..56502384bf 100644 --- a/engines/sci/gfx/gfx_test.cpp +++ b/engines/sci/gfx/gfx_test.cpp @@ -84,7 +84,7 @@ sci_gettime(long *seconds, long *useconds) { struct timeval tv; -#ifdef _WIN32 +#ifdef WIN32 timeBeginPeriod(0); #endif @@ -92,7 +92,7 @@ sci_gettime(long *seconds, long *useconds) *seconds = time(NULL); *useconds = tv.tv_usec; -#ifdef _WIN32 +#ifdef WIN32 timeEndPeriod(0); #endif } diff --git a/engines/sci/gfx/gfx_tools.cpp b/engines/sci/gfx/gfx_tools.cpp index b768475f3f..4a8fdd58f7 100644 --- a/engines/sci/gfx/gfx_tools.cpp +++ b/engines/sci/gfx/gfx_tools.cpp @@ -29,7 +29,7 @@ #include "sci/include/gfx_tools.h" /* set optimisations for Win32: */ -#ifdef _WIN32 +#ifdef WIN32 # include <memory.h> # ifndef SATISFY_PURIFY # pragma intrinsic( memcpy, memset ) diff --git a/engines/sci/gfx/resource/sci_view_0.cpp b/engines/sci/gfx/resource/sci_view_0.cpp index 0101cac5f7..bea6377285 100644 --- a/engines/sci/gfx/resource/sci_view_0.cpp +++ b/engines/sci/gfx/resource/sci_view_0.cpp @@ -26,7 +26,7 @@ ***************************************************************************/ /* set optimisations for Win32: */ -#ifdef _WIN32 +#ifdef WIN32 # include <memory.h> //# pragma intrinsic( memcpy, memset ) #endif |