diff options
| author | bjarni <bjarni@openttd.org> | 2007-10-21 10:53:23 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2007-10-21 10:53:23 +0000 |
| commit | 04dd59df0ef09b53813129a1a89856252d6cdd57 (patch) | |
| tree | e145fe1c62b4987d7198c9abdb1c9aca8ca81595 | |
| parent | 6934188e657d5524fcb4b6502483c3d6ad8b9130 (diff) | |
| download | openttd-04dd59df0ef09b53813129a1a89856252d6cdd57.tar.xz | |
(svn r11325) -Fix (r11312)[FS#1357]: [OSX] fixed compilation on OSX
| -rw-r--r-- | src/stdafx.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/stdafx.h b/src/stdafx.h index 20f565679..d9bf34835 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -8,8 +8,11 @@ /* It seems that we need to include stdint.h before anything else * We need INT64_MAX, which for most systems comes from stdint.h. However, MSVC * does not have stdint.h and apparently neither does MorphOS, so define - * INT64_MAX for them ourselves. */ -#if !defined(_MSC_VER) && !defined( __MORPHOS__) + * INT64_MAX for them ourselves. + * Sometimes OSX headers manages to include stdint.h before this but without + * __STDC_LIMIT_MACROS so it will be without INT64_*. We need to define those + * too if this is the case. */ +#if !defined(_MSC_VER) && !defined( __MORPHOS__) && !defined(_STDINT_H_) # if defined (SUNOS) /* SunOS/Solaris does not have stdint.h, but inttypes.h defines everything * stdint.h defines and we need. */ @@ -20,7 +23,7 @@ # endif #else # define INT64_MAX 9223372036854775807LL -# define INT64_MIN -9223372036854775808LL +# define INT64_MIN (-INT64_MAX - 1) #endif #include <cstdio> |