diff options
| author | Max Horn | 2009-02-15 18:58:10 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-15 18:58:10 +0000 |
| commit | e28ed6b4c9bd406fe9fda7cb244e9d7054567b8d (patch) | |
| tree | 546d148e3d38a37764360600f3b431511e0d7809 | |
| parent | 3ceb1482dbc8559dde0346f3c38b93be6bc1f976 (diff) | |
| download | scummvm-rg350-e28ed6b4c9bd406fe9fda7cb244e9d7054567b8d.tar.gz scummvm-rg350-e28ed6b4c9bd406fe9fda7cb244e9d7054567b8d.tar.bz2 scummvm-rg350-e28ed6b4c9bd406fe9fda7cb244e9d7054567b8d.zip | |
SCI: Got rid of HAVE_FNMATCH_H
svn-id: r38279
| -rw-r--r-- | engines/sci/engine/kfile.cpp | 12 | ||||
| -rw-r--r-- | engines/sci/include/kernel.h | 4 | ||||
| -rw-r--r-- | engines/sci/include/resource.h | 3 |
3 files changed, 4 insertions, 15 deletions
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index 90cea6bdf2..80dd86fba3 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -25,6 +25,8 @@ ***************************************************************************/ +#include "common/str.h" + #include "sci/include/engine.h" @@ -516,14 +518,8 @@ kDeviceInfo_Unix(state_t *s, int funct_nr, int argc, reg_t *argv) char *path1_s = kernel_dereference_char_pointer(s, argv[1], 0); char *path2_s = kernel_dereference_char_pointer(s, argv[2], 0); -#ifndef HAVE_FNMATCH_H -#ifndef _DOS -# warning "File matches will be unprecise!" -#endif - return make_reg(0, !strcmp(path1_s, path2_s)); -#else - return make_reg(0, fnmatch(path1_s, path2_s, FNM_PATHNAME) /* POSIX.2 */); -#endif + //return make_reg(0, !strcmp(path1_s, path2_s)); + return make_reg(0, Common::matchString(path2_s, path1_s, true)); } break; diff --git a/engines/sci/include/kernel.h b/engines/sci/include/kernel.h index a58f0bfc9d..6c4b15926c 100644 --- a/engines/sci/include/kernel.h +++ b/engines/sci/include/kernel.h @@ -35,10 +35,6 @@ #include "sci/include/vm.h" #include "sci/include/console.h" /* sciprintf() */ -#ifdef HAVE_FNMATCH_H -#include <fnmatch.h> -#endif /* HAVE_FNMATCH_H */ - #ifdef _MSC_VER # include <direct.h> # include <ctype.h> diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h index e1133d9f0a..64bb1ffb8d 100644 --- a/engines/sci/include/resource.h +++ b/engines/sci/include/resource.h @@ -66,9 +66,6 @@ #define HAVE_UNLINK #define HAVE_RMDIR #define HAVE_MEMCHR -#ifndef _WIN32 -#define HAVE_FNMATCH_H -#endif #define HAVE_SYS_TIME_H #define HAVE_GETTIMEOFDAY #endif |