diff options
| author | Max Horn | 2009-02-15 14:46:42 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-15 14:46:42 +0000 |
| commit | 9daed50e0165f387f597fec4d06b57805e1f717c (patch) | |
| tree | eca2f45cf9f2b90ef83be380e42d32e99ecb1862 /engines/sci/scicore | |
| parent | 0082a84b8d956bf25c6aaef153d401d641f0923d (diff) | |
| download | scummvm-rg350-9daed50e0165f387f597fec4d06b57805e1f717c.tar.gz scummvm-rg350-9daed50e0165f387f597fec4d06b57805e1f717c.tar.bz2 scummvm-rg350-9daed50e0165f387f597fec4d06b57805e1f717c.zip | |
Fixed lots of warnings and errors (on my system) by backporting a patch I had sent the FreeSCI folks some time ago (but apparently it never made it, or only made it to a branch not imported?)
svn-id: r38245
Diffstat (limited to 'engines/sci/scicore')
| -rw-r--r-- | engines/sci/scicore/resource.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/scicore/tools.cpp | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp index 74cb850beb..cd4faf3518 100644 --- a/engines/sci/scicore/resource.cpp +++ b/engines/sci/scicore/resource.cpp @@ -441,7 +441,7 @@ scir_add_appropriate_sources(resource_mgr_t *mgr, int allow_patches, char *dir) { - char *trailing_slash = ""; + const char *trailing_slash = ""; //char path_separator; sci_dir_t dirent; char *name; diff --git a/engines/sci/scicore/tools.cpp b/engines/sci/scicore/tools.cpp index bd2ec547d6..be2ddce3f4 100644 --- a/engines/sci/scicore/tools.cpp +++ b/engines/sci/scicore/tools.cpp @@ -63,18 +63,10 @@ void usleep (long usec); } while (0); #endif -#if !defined(HAVE_FNMATCH) && !defined(_WIN32) -# include <beos/fnmatch.h> -#endif - #ifdef _DREAMCAST # include <kos/thread.h> #endif -#ifdef __BEOS__ -# include <be/kernel/OS.h> -#endif - #ifdef HAVE_MEMFROB void *memfrob(void *s, size_t n); #endif |