From 25aaf973006f1b7d5d7d373bb12007b2e5b7c11e Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Sun, 15 Feb 2009 10:04:29 +0000
Subject: include win32 build too

svn-id: r38210
---
 engines/sci/engine/scriptdebug.c |  8 ++++----
 engines/sci/scicore/tools.c      | 14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/scriptdebug.c b/engines/sci/engine/scriptdebug.c
index 36d80c01c8..c5e789f842 100644
--- a/engines/sci/engine/scriptdebug.c
+++ b/engines/sci/engine/scriptdebug.c
@@ -36,17 +36,17 @@
 #include "sci/include/sci_widgets.h"
 #include "sci/include/reg_t_hashmap.h"
 
+#ifdef _MSC_VER
+#	include <mmsystem.h>
+#endif
+
 #ifdef _WIN32
 #	include <windows.h>
 #	include <io.h>
-#endif
-
 #	ifdef sleep
 #		undef sleep
 #	endif
 
-#ifdef _MSC_VER
-#	include <mmsystem.h>
 #	define sleep(x) \
 	do { \
 		if (x == 0) { \
diff --git a/engines/sci/scicore/tools.c b/engines/sci/scicore/tools.c
index 802a4f9db1..0653e8d21e 100644
--- a/engines/sci/scicore/tools.c
+++ b/engines/sci/scicore/tools.c
@@ -38,6 +38,13 @@
 #  include <mmsystem.h>
 #  include <sys/types.h>
 #  include <sys/stat.h>
+#endif
+
+#ifdef _WIN32
+#  include <windows.h>
+
+void usleep (long usec);
+
 #	ifdef sleep
 #		undef sleep
 #	endif
@@ -54,13 +61,8 @@
 				fprintf(stderr, "timeEndPeriod(1) failed\n"); \
 		} \
 	} while (0);
-#else
-#ifdef _WIN32
-#  include <windows.h>
-#  include <win32/usleep.h>
-#  include <win32/sci_win32.h>
-#endif
 #endif
+
 #if !defined(HAVE_FNMATCH) && !defined(_MSC_VER)
 #  include <beos/fnmatch.h>
 #endif
-- 
cgit v1.2.3