config: fix both BOOST_HAS_LONG_LONG and BOOST_NO_LONG_LONG getting defined at the same time for some compilers

[SVN r51503]
This commit is contained in:
Beman Dawes
2009-03-01 14:14:09 +00:00
parent dade549b8b
commit 642f99f28d

View File

@ -31,11 +31,13 @@
// remember that since these just declare a bunch of macros, there should be // remember that since these just declare a bunch of macros, there should be
// no namespace issues from this. // no namespace issues from this.
// //
#if !defined(BOOST_HAS_LONG_LONG) \ #if !defined(BOOST_HAS_LONG_LONG) && !defined(BOOST_NO_LONG_LONG) \
&& !defined(BOOST_MSVC) && !defined(__BORLANDC__) && !defined(BOOST_MSVC) && !defined(__BORLANDC__)
# include <limits.h> # include <limits.h>
# if (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX)) # if (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX))
# define BOOST_HAS_LONG_LONG # define BOOST_HAS_LONG_LONG
# else
# define BOOST_NO_LONG_LONG
# endif # endif
#endif #endif