Mercurial > hg > openttd

changeset 7775:315b179cfa8c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r11325) -Fix (r11312)[FS#1357]: [OSX] fixed compilation on OSX
author bjarni <bjarni@openttd.org>
date Sun, 21 Oct 2007 10:53:23 +0000
parents 5280d6e638d1
children 39a8d1c03b0a
files src/stdafx.h
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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>