From fc1f6031434a064ba05de7c8e1ada44b2b7d80ac Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sun, 16 Apr 2017 19:31:25 +0100 Subject: [PATCH] Prevent macro re-definition in cstdint.hpp. See https://svn.boost.org/trac/boost/ticket/12786. --- include/boost/cstdint.hpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/boost/cstdint.hpp b/include/boost/cstdint.hpp index bf7097ec..29164f9a 100644 --- a/include/boost/cstdint.hpp +++ b/include/boost/cstdint.hpp @@ -422,6 +422,20 @@ INT#_C macros if they're not already defined (John Maddock). #if defined(__GNUC__) && (__GNUC__ >= 4) #pragma GCC system_header #endif +// +// Undef the macros as a precaution, since we may get here if has failed +// to define them all, see https://svn.boost.org/trac/boost/ticket/12786 +// +#undef INT8_C +#undef INT16_C +#undef INT32_C +#undef INT64_C +#undef INTMAX_C +#undef UINT8_C +#undef UINT16_C +#undef UINT32_C +#undef UINT64_C +#undef UINTMAX_C #include # define BOOST__STDC_CONSTANT_MACROS_DEFINED