diff options
author | Max Horn | 2009-02-21 19:04:27 +0000 |
---|---|---|
committer | Max Horn | 2009-02-21 19:04:27 +0000 |
commit | f00f020d0821bed6dcf041cc65980134487ae67b (patch) | |
tree | af3709f6cec7780d7a8a9d3aba7a2e9650083dc1 /engines/sci/tools.h | |
parent | 798a795b5ed78b1ae4817d8e49bb281d65ad921b (diff) | |
download | scummvm-rg350-f00f020d0821bed6dcf041cc65980134487ae67b.tar.gz scummvm-rg350-f00f020d0821bed6dcf041cc65980134487ae67b.tar.bz2 scummvm-rg350-f00f020d0821bed6dcf041cc65980134487ae67b.zip |
SCI: Moved sci_dir_t and GTimeVal to tools.h
svn-id: r38728
Diffstat (limited to 'engines/sci/tools.h')
-rw-r--r-- | engines/sci/tools.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/engines/sci/tools.h b/engines/sci/tools.h index 478e79f5e2..7f007b5ea3 100644 --- a/engines/sci/tools.h +++ b/engines/sci/tools.h @@ -66,6 +66,16 @@ # include <fcntl.h> #endif + +// FIXME: 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> +#endif + + #define GUINT16_SWAP_LE_BE_CONSTANT(val) ((((val) & 0x00ff) << 8) | (((val) & 0xff00) >> 8)) #define GUINT32_SWAP_LE_BE_CONSTANT(val) ( \ @@ -97,6 +107,24 @@ namespace Sci { + +typedef struct { + long tv_sec; + long tv_usec; +} GTimeVal; + +typedef struct { +#ifdef WIN32 + long search; + struct _finddata_t fileinfo; +#else + DIR *dir; + char *mask_copy; +#endif +} sci_dir_t; /* used by sci_find_first and friends */ + + + /**** FUNCTION DECLARATIONS ****/ #define getInt16 (int16)READ_UINT16 |