diff options
| author | Max Horn | 2006-04-08 12:39:27 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-08 12:39:27 +0000 |
| commit | 4a8c9c323d7914c3ad33c884ecf9e0cb73ee2db5 (patch) | |
| tree | 215d8fff62f9ba6ec695fe445b8599431a0461ea /common | |
| parent | 655b85bc84dfbc239c762b2e268824305787b83d (diff) | |
| download | scummvm-rg350-4a8c9c323d7914c3ad33c884ecf9e0cb73ee2db5.tar.gz scummvm-rg350-4a8c9c323d7914c3ad33c884ecf9e0cb73ee2db5.tar.bz2 scummvm-rg350-4a8c9c323d7914c3ad33c884ecf9e0cb73ee2db5.zip | |
AmigaOS4 changes from tracker #1416370
svn-id: r21691
Diffstat (limited to 'common')
| -rw-r--r-- | common/scummsys.h | 6 | ||||
| -rw-r--r-- | common/util.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 98d9bab6c7..e396407b50 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -294,12 +294,6 @@ #define SCUMM_BIG_ENDIAN #define SCUMM_NEED_ALIGNMENT - // FIXME: Why is this here? If it does declare types int8 etc., and they - // are not compatible with our typedefs below, we need a proper fix. - // In general, though, you should avoid port specific includes in this - // header file, if possible. - #include <exec/types.h> - #elif defined(__SYMBIAN32__) #define scumm_stricmp strcasecmp diff --git a/common/util.h b/common/util.h index 5f6088f176..79dbba6451 100644 --- a/common/util.h +++ b/common/util.h @@ -26,7 +26,7 @@ #include "common/str.h" #include "common/array.h" -#if defined (__INNOTEK_LIBC__) +#if defined (__INNOTEK_LIBC__) || (defined (__amigaos4__) && defined(__NEWLIB__)) #undef MIN #undef MAX #endif |