libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better (?) fix for scicore/tools.cpp -- don't add Win32 specific code in a section of code which is supposed to only be used on Windows anyway... :)

Browse Source 
svn-id: r38302
This commit is contained in:
Max Horn 2009-02-15 21:11:25 +00:00
parent 8e056b3092
commit 0641af5d1c
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/sci/scicore/tools.cpp
View File

@ -27,12 +27,14 @@
#include <stdlib.h> #include <stdlib.h>
#ifndef _WIN32 #ifdef UNIX
#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */ #define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */
#include <fnmatch.h> #include <fnmatch.h>
#endif #endif
#include "common/scummsys.h"
#include "common/str.h" #include "common/str.h"
#include "sci/include/engine.h" #include "sci/include/engine.h"
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
@ -45,7 +47,7 @@
# include <sys/stat.h> # include <sys/stat.h>
#endif #endif
#ifdef _WIN32 #ifdef WIN32
# include <windows.h> # include <windows.h>
# include <mmsystem.h> # include <mmsystem.h>
@ -253,7 +255,7 @@ sci_gettime(long *seconds, long *useconds)
*seconds = tv.tv_sec; *seconds = tv.tv_sec;
*useconds = tv.tv_usec; *useconds = tv.tv_usec;
} }
#elif defined (_WIN32) #elif defined (WIN32)
/*WARNING(Incorrect)*/ /*WARNING(Incorrect)*/
/* Warning: This function only retrieves the amount of mseconds since the start of /* Warning: This function only retrieves the amount of mseconds since the start of
@ -294,7 +296,7 @@ sci_get_current_time(GTimeVal *val)
/************* Directory entities *************/ /************* Directory entities *************/
#if defined(_WIN32) #if defined(WIN32)
/******** Dir: Win32 CODE ********/ /******** Dir: Win32 CODE ********/
void void
@ -388,7 +390,7 @@ sci_finish_find(sci_dir_t *dir)
} }
} }
#else /* !_WIN32 */ #else /* !WIN32 */
/******** Dir: UNIX CODE ********/ /******** Dir: UNIX CODE ********/
void void
@ -428,13 +430,8 @@ sci_find_next(sci_dir_t *dir)
if (match->d_name[0] == '.') if (match->d_name[0] == '.')
continue; continue;
#ifdef _WIN32
if (Common::matchString(match->d_name, dir->mask_copy, true))
return match->d_name;
#else
if (!fnmatch(dir->mask_copy, match->d_name, FNM_CASEFOLD)) if (!fnmatch(dir->mask_copy, match->d_name, FNM_CASEFOLD))
return match->d_name; return match->d_name;
#endif
} }
sci_finish_find(dir); sci_finish_find(dir);
@ -452,7 +449,7 @@ sci_finish_find(sci_dir_t *dir)
} }
} }
#endif /* !_WIN32 */ #endif /* !WIN32 */
/************* /Directory entities *************/ /************* /Directory entities *************/
@ -501,7 +498,7 @@ sci_mkpath(const char *path)
char * char *
sci_get_homedir(void) sci_get_homedir(void)
{ {
#ifdef _WIN32 #ifdef WIN32
char *_path_buf = (char*)malloc(MAX_PATH); char *_path_buf = (char*)malloc(MAX_PATH);
char *dr = getenv("HOMEDRIVE"); char *dr = getenv("HOMEDRIVE");
char *path = getenv("HOMEPATH"); char *path = getenv("HOMEPATH");
@ -600,7 +597,7 @@ sci_sched_yield()
snooze(0); snooze(0);
} }
#elif defined (_WIN32) #elif defined (WIN32)
void void
sci_sched_yield() sci_sched_yield()