diff options
| author | Travis Howell | 2009-02-15 10:21:22 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-02-15 10:21:22 +0000 |
| commit | 5e2def9ca5c1b1e90435e38adf3585964c32e655 (patch) | |
| tree | 667b14d2a22abe3412e8716fb115e9b90039c53f | |
| parent | 59588685039bcc0b87e4c2785fcf7ad0c7b23cf8 (diff) | |
| download | scummvm-rg350-5e2def9ca5c1b1e90435e38adf3585964c32e655.tar.gz scummvm-rg350-5e2def9ca5c1b1e90435e38adf3585964c32e655.tar.bz2 scummvm-rg350-5e2def9ca5c1b1e90435e38adf3585964c32e655.zip | |
Fix mingw compilation.
svn-id: r38217
| -rw-r--r-- | engines/sci/engine/kernel.c | 3 | ||||
| -rw-r--r-- | engines/sci/engine/kfile.c | 6 | ||||
| -rw-r--r-- | engines/sci/engine/scriptdebug.c | 5 | ||||
| -rw-r--r-- | engines/sci/include/scitypes.h | 2 | ||||
| -rw-r--r-- | engines/sci/scicore/tools.c | 6 |
5 files changed, 6 insertions, 16 deletions
diff --git a/engines/sci/engine/kernel.c b/engines/sci/engine/kernel.c index ec7ac6e241..7498d9763b 100644 --- a/engines/sci/engine/kernel.c +++ b/engines/sci/engine/kernel.c @@ -30,9 +30,6 @@ #include "sci/include/engine.h" #ifdef _WIN32 # include <windows.h> -#endif /* _WIN32 */ - -#ifdef _MSC_VER # include <mmsystem.h> #endif diff --git a/engines/sci/engine/kfile.c b/engines/sci/engine/kfile.c index 04abbb8782..629a1a6f00 100644 --- a/engines/sci/engine/kfile.c +++ b/engines/sci/engine/kfile.c @@ -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 diff --git a/engines/sci/engine/scriptdebug.c b/engines/sci/engine/scriptdebug.c index c5e789f842..b38a1aaf35 100644 --- a/engines/sci/engine/scriptdebug.c +++ b/engines/sci/engine/scriptdebug.c @@ -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 diff --git a/engines/sci/include/scitypes.h b/engines/sci/include/scitypes.h index be13a1d03b..3de058e4bf 100644 --- a/engines/sci/include/scitypes.h +++ b/engines/sci/include/scitypes.h @@ -124,7 +124,7 @@ typedef struct { } GTimeVal; typedef struct { -#ifdef _MSC_VER +#ifdef _WIN32 long search; struct _finddata_t fileinfo; #else diff --git a/engines/sci/scicore/tools.c b/engines/sci/scicore/tools.c index 0653e8d21e..8167da33b4 100644 --- a/engines/sci/scicore/tools.c +++ b/engines/sci/scicore/tools.c @@ -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 @@ void usleep (long usec); } 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 @@ sci_get_current_time(GTimeVal *val) /************* Directory entities *************/ -#if defined(_WIN32) && defined(_MSC_VER) +#if defined(_WIN32) /******** Dir: Win32 CODE ********/ void |