From 9daed50e0165f387f597fec4d06b57805e1f717c Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 15 Feb 2009 14:46:42 +0000 Subject: 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 --- engines/sci/scicore/resource.cpp | 2 +- engines/sci/scicore/tools.cpp | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'engines/sci/scicore') 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 -#endif - #ifdef _DREAMCAST # include #endif -#ifdef __BEOS__ -# include -#endif - #ifdef HAVE_MEMFROB void *memfrob(void *s, size_t n); #endif -- cgit v1.2.3