SCI: Changed _WIN32 -> WIN32; _DREAMCAST -> __DC__; removed _DOS stuff

svn-id: r38305

6 files changed, 11 insertions, 11 deletions

diff --git a/engines/sci/sfx/device/devices.cpp b/engines/sci/sfx/device/devices.cpp
index 2e54b1df4f..f51c928d7e 100644
--- a/engines/sci/sfx/device/devices.cpp
+++ b/engines/sci/sfx/device/devices.cpp
@@ -35,7 +35,7 @@
 #ifdef HAVE_ALSA
 extern struct _midi_device sfx_device_midi_alsa;
 #endif
-#if !defined(_DOS) && !defined(_WIN32) && !defined(_DREAMCAST) && !defined(__MORPHOS__) && !defined(ARM_WINCE) && !defined(_GP32)
+#if !defined(WIN32) && !defined(__DC__) && !defined(__MORPHOS__) && !defined(ARM_WINCE) && !defined(_GP32)
 extern struct _midi_device sfx_device_midi_unixraw;
 #endif
 
@@ -54,7 +54,7 @@ static struct _midi_device *devices_midi[] = {
 #ifdef HAVE_ALSA
 		&sfx_device_midi_alsa,
 #endif
-#if !defined(_DOS) && !defined(_WIN32) && !defined(_DREAMCAST) && !defined(__MORPHOS__) && !defined(ARM_WINCE) && !defined(_GP32)
+#ifdef UNIX
 		&sfx_device_midi_unixraw,
 #endif
 #endif // SCUMMVM
diff --git a/engines/sci/sfx/mixer/mixers.cpp b/engines/sci/sfx/mixer/mixers.cpp
index 997525f173..c0af0e3a53 100644
--- a/engines/sci/sfx/mixer/mixers.cpp
+++ b/engines/sci/sfx/mixer/mixers.cpp
@@ -30,12 +30,12 @@
 
 extern sfx_pcm_mixer_t sfx_pcm_mixer_soft_linear;
 
-#ifdef _DREAMCAST
+#ifdef __DC__
 extern sfx_pcm_mixer_t sfx_pcm_mixer_dc;
 #endif
 
 static sfx_pcm_mixer_t *mixers[] = {
-#ifdef _DREAMCAST
+#ifdef __DC__
 	&sfx_pcm_mixer_dc,
 #endif
 	&sfx_pcm_mixer_soft_linear,
diff --git a/engines/sci/sfx/pcm_device/pcm_devices.cpp b/engines/sci/sfx/pcm_device/pcm_devices.cpp
index a29de8896f..09e20bb07b 100644
--- a/engines/sci/sfx/pcm_device/pcm_devices.cpp
+++ b/engines/sci/sfx/pcm_device/pcm_devices.cpp
@@ -30,7 +30,7 @@ extern sfx_pcm_device_t sfx_pcm_driver_sdl;
 #	ifdef HAVE_ALSA
 extern sfx_pcm_device_t sfx_pcm_driver_alsa;
 #	endif
-#	ifdef _DREAMCAST
+#	ifdef __DC__
 extern sfx_pcm_device_t sfx_pcm_driver_dc;
 #	endif
 #endif // SCUMMVM
@@ -47,7 +47,7 @@ sfx_pcm_device_t *pcmout_drivers[] = {
 #	ifdef HAVE_ALSA
 		&sfx_pcm_driver_alsa,
 #	endif
-#	ifdef _DREAMCAST
+#	ifdef __DC__
 		&sfx_pcm_driver_dc,
 #	endif
 #endif // SCUMMVM
diff --git a/engines/sci/sfx/seq/mt32.cpp b/engines/sci/sfx/seq/mt32.cpp
index b71d474927..de478cf4f6 100644
--- a/engines/sci/sfx/seq/mt32.cpp
+++ b/engines/sci/sfx/seq/mt32.cpp
@@ -26,7 +26,7 @@
 #include "instrument-map.h"
 #include <resource.h>
 
-#ifdef _WIN32
+#ifdef WIN32
 #  include <win32/sci_win32.h>
 #  include <windows.h>
 #endif
@@ -381,7 +381,7 @@ midi_mt32_sysex_delay(void)
   /* Under Win32, we won't get any sound, in any case... */
 #ifdef HAVE_USLEEP
 	usleep(320 * 63); /* One MIDI byte is 320us, 320us * 63 > 20ms */
-#elif defined (_WIN32)
+#elif defined (WIN32)
 	Sleep(((320 * 63) / 1000) + 1);
 #elif defined (__BEOS__)
 	snooze(320 * 63);
diff --git a/engines/sci/sfx/softseq/opl2.cpp b/engines/sci/sfx/softseq/opl2.cpp
index f6e60215b0..80b6adf162 100644
--- a/engines/sci/sfx/softseq/opl2.cpp
+++ b/engines/sci/sfx/softseq/opl2.cpp
@@ -25,7 +25,7 @@
 
 #include "fmopl.h"
 
-#ifdef _DREAMCAST
+#ifdef __DC__
 #define SAMPLE_RATE 22050
 #define CHANNELS SFX_PCM_MONO
 #define STEREO 0
diff --git a/engines/sci/sfx/timer/timers.cpp b/engines/sci/sfx/timer/timers.cpp
index 353ae11ca7..71e6e75c96 100644
--- a/engines/sci/sfx/timer/timers.cpp
+++ b/engines/sci/sfx/timer/timers.cpp
@@ -36,7 +36,7 @@ extern sfx_timer_t sfx_timer_scummvm;
 extern sfx_timer_t sfx_timer_sigalrm;
 #endif
 
-#ifdef _DREAMCAST
+#ifdef __DC__
 extern sfx_timer_t sfx_timer_pthread;
 #endif
 #endif // SCUMMVM
@@ -48,7 +48,7 @@ sfx_timer_t *sfx_timers[] = {
 #ifdef HAVE_SETITIMER
 	&sfx_timer_sigalrm,
 #endif
-#ifdef _DREAMCAST
+#ifdef __DC__
 	&sfx_timer_pthread,
 #endif
 #endif // SCUMMVM