diff options
| author | Max Horn | 2004-12-25 23:35:30 +0000 |
|---|---|---|
| committer | Max Horn | 2004-12-25 23:35:30 +0000 |
| commit | 65ca0a07289216d7183f86b8d3b76f0033c8d34e (patch) | |
| tree | 139c30fd049e12dc9501b97cfe2ddd65c9271f73 /sky/intro.cpp | |
| parent | 71051f551e831191f18734a2902559f33346d0e0 (diff) | |
| download | scummvm-rg350-65ca0a07289216d7183f86b8d3b76f0033c8d34e.tar.gz scummvm-rg350-65ca0a07289216d7183f86b8d3b76f0033c8d34e.tar.bz2 scummvm-rg350-65ca0a07289216d7183f86b8d3b76f0033c8d34e.zip | |
Fix warning on OSX
svn-id: r16327
Diffstat (limited to 'sky/intro.cpp')
| -rw-r--r-- | sky/intro.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sky/intro.cpp b/sky/intro.cpp index 2c64f2b07d..b37d7e449e 100644 --- a/sky/intro.cpp +++ b/sky/intro.cpp @@ -32,6 +32,13 @@ namespace Sky { +#ifdef MACOSX +// FIXME: DELAY is already defined in sys/param.h ! +// Better fix would be to remove sys/param.h froms stdafx.h, or +// to change the name DELAY here to something else. +#undef DELAY +#endif + #define SHOWSCREEN 0 #define COMMANDEND 0 // end of COMMANDFLIRT block #define FADEUP 1 // fade up palette |