diff options
| author | Paweł Kołodziejski | 2009-02-15 09:56:04 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2009-02-15 09:56:04 +0000 |
| commit | 311344b4451894120fa4688e431c67d5f08bd2fe (patch) | |
| tree | 8372dd946fd954d439f2efb2509e8c336a66b0a8 /engines/sci/include | |
| parent | 06b5b22a8cae7eb8baad17c280383c37e699e2de (diff) | |
| download | scummvm-rg350-311344b4451894120fa4688e431c67d5f08bd2fe.tar.gz scummvm-rg350-311344b4451894120fa4688e431c67d5f08bd2fe.tar.bz2 scummvm-rg350-311344b4451894120fa4688e431c67d5f08bd2fe.zip | |
fixed msvc9 compilation
svn-id: r38208
Diffstat (limited to 'engines/sci/include')
| -rw-r--r-- | engines/sci/include/resource.h | 7 | ||||
| -rw-r--r-- | engines/sci/include/sci_memory.h | 7 | ||||
| -rw-r--r-- | engines/sci/include/scitypes.h | 6 | ||||
| -rw-r--r-- | engines/sci/include/sfx_core.h | 2 |
4 files changed, 21 insertions, 1 deletions
diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h index aa3e31a671..03069006ac 100644 --- a/engines/sci/include/resource.h +++ b/engines/sci/include/resource.h @@ -60,6 +60,7 @@ #ifdef SCUMMVM //TODO: Remove these defines by replacing their functionality by their ScummVM counterparts #define HAVE_ISBLANK +#ifndef _MSC_VER #define HAVE_UNISTD_H #define HAVE_FCNTL_H #define HAVE_UNLINK @@ -68,6 +69,7 @@ #define HAVE_FNMATCH_H #define HAVE_SYS_TIME_H #define HAVE_GETTIMEOFDAY +#endif #define VERSION "0.6.4" #endif // SCUMMVM @@ -107,7 +109,6 @@ #ifdef _WIN32 # include <io.h> -# include <sci_win32.h> #else /* !_WIN32 */ # define DLLEXTERN #endif /* !_WIN32 */ @@ -121,6 +122,10 @@ # include <sys/timeb.h> # include <fcntl.h> # include <windows.h> +# undef strcasecmp +# undef strncasecmp +# define strcasecmp _stricmp +# define strncasecmp _strnicmp #endif diff --git a/engines/sci/include/sci_memory.h b/engines/sci/include/sci_memory.h index 9ef7fa41cb..4b02454e1d 100644 --- a/engines/sci/include/sci_memory.h +++ b/engines/sci/include/sci_memory.h @@ -81,6 +81,13 @@ # define scim_inline inline #endif +#ifdef _MSC_VER +# undef strcasecmp +# undef strncasecmp +# define strcasecmp _stricmp +# define strncasecmp _strnicmp +#endif + /********** macros for error messages **********/ /* diff --git a/engines/sci/include/scitypes.h b/engines/sci/include/scitypes.h index b252d59565..be13a1d03b 100644 --- a/engines/sci/include/scitypes.h +++ b/engines/sci/include/scitypes.h @@ -33,7 +33,13 @@ // TODO: rework sci_dir_t to use common/fs.h and remove these includes #include <sys/types.h> +#ifndef _MSC_VER #include <dirent.h> +#else +#include <io.h> +# undef inline /* just to be sure it is not defined */ +# define inline __inline +#endif typedef int8 gint8; typedef uint8 guint8; diff --git a/engines/sci/include/sfx_core.h b/engines/sci/include/sfx_core.h index 9a04e9f9e5..3b8498b5bc 100644 --- a/engines/sci/include/sfx_core.h +++ b/engines/sci/include/sfx_core.h @@ -30,7 +30,9 @@ #ifndef _SFX_CORE_H_ #define _SFX_CORE_H_ +#ifndef _MSC_VER #include <config.h> +#endif #define SFX_OK 0 #define SFX_ERROR -1 |