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/include | |
| 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/include')
| -rw-r--r-- | engines/sci/include/sci_memory.h | 5 | ||||
| -rw-r--r-- | engines/sci/include/scitypes.h | 23 | ||||
| -rw-r--r-- | engines/sci/include/sfx_songlib.h | 1 |
3 files changed, 1 insertions, 28 deletions
diff --git a/engines/sci/include/sci_memory.h b/engines/sci/include/sci_memory.h index c39b6c86fe..85a23a1fc6 100644 --- a/engines/sci/include/sci_memory.h +++ b/engines/sci/include/sci_memory.h @@ -46,11 +46,6 @@ #include "common/scummsys.h" #include "sci/tools.h" -// FIXME: Get rid of the following #include -#ifdef _MSC_VER -# include <direct.h> // for chdir, rmdir, _gecwd, getcwd, mkdir -#endif - namespace Sci { /********** the memory allocation macros **********/ diff --git a/engines/sci/include/scitypes.h b/engines/sci/include/scitypes.h index cc3728be38..f7bd150d02 100644 --- a/engines/sci/include/scitypes.h +++ b/engines/sci/include/scitypes.h @@ -28,14 +28,6 @@ #include "common/scummsys.h" -// TODO: 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 - namespace Sci { typedef int8 gint8; @@ -53,21 +45,6 @@ typedef gint8 sbyte; typedef guint8 byte; typedef guint16 word; -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 */ - } // End of namespace Sci #endif /* !SCI_TYPES */ diff --git a/engines/sci/include/sfx_songlib.h b/engines/sci/include/sfx_songlib.h index c5cf4ac76a..44523b27d2 100644 --- a/engines/sci/include/sfx_songlib.h +++ b/engines/sci/include/sfx_songlib.h @@ -30,6 +30,7 @@ #include "common/scummsys.h" +#include "sci/tools.h" // For GTimeVal #include "sci/include/scitypes.h" #include "sci/include/sfx_iterator.h" |