aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaweł Kołodziejski2009-02-15 20:02:43 +0000
committerPaweł Kołodziejski2009-02-15 20:02:43 +0000
commit7d0d96ecc1ff743bdb9828e1da52d20d67eabc72 (patch)
tree92553caaa214b48654193007b227c46e08fcced8 /engines
parentd7dea4ff17cd5ee6737cbe50e5d47c13e946f86c (diff)
downloadscummvm-rg350-7d0d96ecc1ff743bdb9828e1da52d20d67eabc72.tar.gz
scummvm-rg350-7d0d96ecc1ff743bdb9828e1da52d20d67eabc72.tar.bz2
scummvm-rg350-7d0d96ecc1ff743bdb9828e1da52d20d67eabc72.zip
fixed compilation with msvc
svn-id: r38285
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/gfx/gfx_res_options.cpp6
-rw-r--r--engines/sci/include/resource.h4
-rw-r--r--engines/sci/sfx/player/polled.cpp2
3 files changed, 11 insertions, 1 deletions
diff --git a/engines/sci/gfx/gfx_res_options.cpp b/engines/sci/gfx/gfx_res_options.cpp
index 0692fece0f..349058427f 100644
--- a/engines/sci/gfx/gfx_res_options.cpp
+++ b/engines/sci/gfx/gfx_res_options.cpp
@@ -33,6 +33,12 @@
#include <ctype.h>
+#ifdef _MSC_VER
+#ifndef isblank
+# define isblank(c) ((c) == ' ' || (c) == '\t')
+#endif
+#endif
+
/*#define DEBUG*/
static gfx_res_pattern_list_t*
diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h
index 42a7c6ceeb..cb6bc537ff 100644
--- a/engines/sci/include/resource.h
+++ b/engines/sci/include/resource.h
@@ -102,10 +102,12 @@
#include "sci/include/scitypes.h"
// FIXME: Mostly for close() in lots of places. Get rid of this!
+#ifndef _MSC_VER
#include <unistd.h>
+#endif
#ifdef _MSC_VER
-# include <sys/timeb.h>
+//# include <sys/timeb.h>
# include <fcntl.h>
# include <windows.h>
# undef strcasecmp
diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp
index 794ed36314..a5e85ca191 100644
--- a/engines/sci/sfx/player/polled.cpp
+++ b/engines/sci/sfx/player/polled.cpp
@@ -30,7 +30,9 @@
#include "sci/sfx/softseq.h"
#include "sci/sfx/mixer.h"
+#ifndef _MSC_VER
#include <unistd.h> // for close()
+#endif
static song_iterator_t *play_it;
static int play_paused = 0;