diff options
| author | maedhros <maedhros@openttd.org> | 2007-01-23 15:47:28 +0000 |
|---|---|---|
| committer | maedhros <maedhros@openttd.org> | 2007-01-23 15:47:28 +0000 |
| commit | 18fa2ca2339224d246bad9ed69c0e4e27354c796 (patch) | |
| tree | d233417f82996403051ff7a20b2a6302f1d0ae7d | |
| parent | cfb7fb3ac4f261eb2bae02842a5af8dccdd0c7b5 (diff) | |
| download | openttd-18fa2ca2339224d246bad9ed69c0e4e27354c796.tar.xz | |
(svn r8374) -Fix (r8367): LLONG_MAX isn't always defined, and INT64_MAX describes the
required value better anyway. However, INT64_MAX comes from stdint.h which
doesn't seem to exist on MSVC or MorphOS, so it's defined manually for them.
| -rw-r--r-- | src/graph_gui.cpp | 2 | ||||
| -rw-r--r-- | src/stdafx.h | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 7427e7088..587f90947 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -39,7 +39,7 @@ enum { }; /* Apparently these don't play well with enums. */ -static const int64 INVALID_DATAPOINT = LLONG_MAX; // Value used for a datapoint that shouldn't be drawn. +static const int64 INVALID_DATAPOINT = INT64_MAX; // Value used for a datapoint that shouldn't be drawn. static const uint INVALID_DATAPOINT_POS = UINT_MAX; // Used to determine if the previous point was drawn. typedef struct GraphDrawer { diff --git a/src/stdafx.h b/src/stdafx.h index 8bff614b4..4d618c903 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -316,4 +316,14 @@ assert_compile(sizeof(uint8) == 1); # define Point OTTD_AMIGA_POINT #endif +// 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__) +# define __STDC_LIMIT_MACROS +# include <stdint.h> +#else +# define INT64_MAX 9223372036854775807LL +#endif + #endif /* STDAFX_H */ |