diff options
| author | Paweł Kołodziejski | 2009-02-17 20:26:57 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2009-02-17 20:26:57 +0000 |
| commit | ebff01c4632d08a8103e6dee1bdb010eb2993a9e (patch) | |
| tree | e387311a36deca427f29e477120877b2700c02d1 /engines/sci/scicore | |
| parent | d428b4da6c73632f1b9fefb52dce2b8275f80b5c (diff) | |
| download | scummvm-rg350-ebff01c4632d08a8103e6dee1bdb010eb2993a9e.tar.gz scummvm-rg350-ebff01c4632d08a8103e6dee1bdb010eb2993a9e.tar.bz2 scummvm-rg350-ebff01c4632d08a8103e6dee1bdb010eb2993a9e.zip | |
shat up ARRAYSIZE redefine compiler warnings
svn-id: r38444
Diffstat (limited to 'engines/sci/scicore')
| -rw-r--r-- | engines/sci/scicore/tools.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/engines/sci/scicore/tools.cpp b/engines/sci/scicore/tools.cpp index ec9580681e..4436ce2e41 100644 --- a/engines/sci/scicore/tools.cpp +++ b/engines/sci/scicore/tools.cpp @@ -24,19 +24,6 @@ */ -#include "common/scummsys.h" -#include "common/str.h" - -#ifdef UNIX -#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */ -#include <fnmatch.h> -#endif - -#include "sci/include/engine.h" - -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif #ifdef _MSC_VER # include <sys/timeb.h> # include <windows.h> @@ -49,8 +36,6 @@ # include <errno.h> # include <mmsystem.h> -void usleep(long usec); - # ifdef sleep # undef sleep # endif @@ -69,6 +54,20 @@ void usleep(long usec); } while (0); #endif +#include "common/scummsys.h" +#include "common/str.h" + +#ifdef UNIX +#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */ +#include <fnmatch.h> +#endif + +#include "sci/include/engine.h" + +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif + #ifdef __DC__ # include <kos/thread.h> #endif |