From 07505c76f80cbabfccd3f8626883e2bd6b75bff1 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 11 May 2001 10:47:57 +0000 Subject: [PATCH] Preprocessor fix for VC6 + STLPort 4.1b6 [SVN r10087] --- include/boost/cstdint.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/boost/cstdint.hpp b/include/boost/cstdint.hpp index 9db0eb1..68daea5 100644 --- a/include/boost/cstdint.hpp +++ b/include/boost/cstdint.hpp @@ -144,7 +144,7 @@ namespace boost // 64-bit types + intmax_t and uintmax_t ----------------------------------// -# if defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX) +# if defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || (defined(ULONGLONG_MAX) && !defined(BOOST_MSVC) && !defined(__BORLANDC__)) # if (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615U) || (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615U) || (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615U) // 2**64 - 1 typedef long long intmax_t; @@ -311,3 +311,4 @@ Added 23rd September (John Maddock). #endif // __STDC_CONSTANT_MACROS_DEFINED etc. +