[Scummvm-cvs-logs] SF.net SVN: scummvm:[38217] scummvm/trunk/engines/sci
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sun Feb 15 11:21:22 CET 2009
Revision: 38217
http://scummvm.svn.sourceforge.net/scummvm/?rev=38217&view=rev
Author: Kirben
Date: 2009-02-15 10:21:22 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
Fix mingw compilation.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kernel.c
scummvm/trunk/engines/sci/engine/kfile.c
scummvm/trunk/engines/sci/engine/scriptdebug.c
scummvm/trunk/engines/sci/include/scitypes.h
scummvm/trunk/engines/sci/scicore/tools.c
Modified: scummvm/trunk/engines/sci/engine/kernel.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.c 2009-02-15 10:17:20 UTC (rev 38216)
+++ scummvm/trunk/engines/sci/engine/kernel.c 2009-02-15 10:21:22 UTC (rev 38217)
@@ -30,9 +30,6 @@
#include "sci/include/engine.h"
#ifdef _WIN32
# include <windows.h>
-#endif /* _WIN32 */
-
-#ifdef _MSC_VER
# include <mmsystem.h>
#endif
Modified: scummvm/trunk/engines/sci/engine/kfile.c
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.c 2009-02-15 10:17:20 UTC (rev 38216)
+++ scummvm/trunk/engines/sci/engine/kfile.c 2009-02-15 10:21:22 UTC (rev 38217)
@@ -28,11 +28,8 @@
#include "sci/include/engine.h"
-#ifdef _MSC_VER
-#define MAX_PATHLEN MAXPATHLEN
-#endif
-
#ifdef _WIN32
+#define MAX_PATHLEN MAXPATHLEN
# ifndef PATH_MAX
# define PATH_MAX 255
# endif
@@ -40,7 +37,6 @@
# include <windows.h>
# include <sys/types.h>
# include <sys/stat.h>
-# define stat _stat
#elif defined (_DREAMCAST)
# include <dc.h>
#endif
Modified: scummvm/trunk/engines/sci/engine/scriptdebug.c
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.c 2009-02-15 10:17:20 UTC (rev 38216)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.c 2009-02-15 10:21:22 UTC (rev 38217)
@@ -36,12 +36,9 @@
#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 <mmsystem.h>
# include <io.h>
# ifdef sleep
# undef sleep
Modified: scummvm/trunk/engines/sci/include/scitypes.h
===================================================================
--- scummvm/trunk/engines/sci/include/scitypes.h 2009-02-15 10:17:20 UTC (rev 38216)
+++ scummvm/trunk/engines/sci/include/scitypes.h 2009-02-15 10:21:22 UTC (rev 38217)
@@ -124,7 +124,7 @@
} GTimeVal;
typedef struct {
-#ifdef _MSC_VER
+#ifdef _WIN32
long search;
struct _finddata_t fileinfo;
#else
Modified: scummvm/trunk/engines/sci/scicore/tools.c
===================================================================
--- scummvm/trunk/engines/sci/scicore/tools.c 2009-02-15 10:17:20 UTC (rev 38216)
+++ scummvm/trunk/engines/sci/scicore/tools.c 2009-02-15 10:21:22 UTC (rev 38217)
@@ -35,13 +35,13 @@
#ifdef _MSC_VER
# include <sys/timeb.h>
# include <windows.h>
-# include <mmsystem.h>
# include <sys/types.h>
# include <sys/stat.h>
#endif
#ifdef _WIN32
# include <windows.h>
+# include <mmsystem.h>
void usleep (long usec);
@@ -63,7 +63,7 @@
} while (0);
#endif
-#if !defined(HAVE_FNMATCH) && !defined(_MSC_VER)
+#if !defined(HAVE_FNMATCH) && !defined(_WIN32)
# include <beos/fnmatch.h>
#endif
@@ -296,7 +296,7 @@
/************* Directory entities *************/
-#if defined(_WIN32) && defined(_MSC_VER)
+#if defined(_WIN32)
/******** Dir: Win32 CODE ********/
void
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