[Scummvm-cvs-logs] SF.net SVN: scummvm:[38285] scummvm/trunk/engines/sci
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sun Feb 15 21:02:43 CET 2009
Revision: 38285
http://scummvm.svn.sourceforge.net/scummvm/?rev=38285&view=rev
Author: aquadran
Date: 2009-02-15 20:02:43 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
fixed compilation with msvc
Modified Paths:
--------------
scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp
scummvm/trunk/engines/sci/include/resource.h
scummvm/trunk/engines/sci/sfx/player/polled.cpp
Modified: scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp 2009-02-15 19:52:44 UTC (rev 38284)
+++ scummvm/trunk/engines/sci/gfx/gfx_res_options.cpp 2009-02-15 20:02:43 UTC (rev 38285)
@@ -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*
Modified: scummvm/trunk/engines/sci/include/resource.h
===================================================================
--- scummvm/trunk/engines/sci/include/resource.h 2009-02-15 19:52:44 UTC (rev 38284)
+++ scummvm/trunk/engines/sci/include/resource.h 2009-02-15 20:02:43 UTC (rev 38285)
@@ -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
Modified: scummvm/trunk/engines/sci/sfx/player/polled.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/player/polled.cpp 2009-02-15 19:52:44 UTC (rev 38284)
+++ scummvm/trunk/engines/sci/sfx/player/polled.cpp 2009-02-15 20:02:43 UTC (rev 38285)
@@ -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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list