From 642f99f28d45fee00e3929e706bf794f50c207ee Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Sun, 1 Mar 2009 14:14:09 +0000 Subject: [PATCH] config: fix both BOOST_HAS_LONG_LONG and BOOST_NO_LONG_LONG getting defined at the same time for some compilers [SVN r51503] --- include/boost/config/suffix.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/boost/config/suffix.hpp b/include/boost/config/suffix.hpp index 142e8e00..ca803306 100644 --- a/include/boost/config/suffix.hpp +++ b/include/boost/config/suffix.hpp @@ -31,11 +31,13 @@ // remember that since these just declare a bunch of macros, there should be // 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__) # include # if (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX)) # define BOOST_HAS_LONG_LONG +# else +# define BOOST_NO_LONG_LONG # endif #endif