Petr Machata 830a7f
diff -up boost_1_54_0/boost/cstdint.hpp\~ boost_1_54_0/boost/cstdint.hpp
Petr Machata 830a7f
--- boost_1_54_0/boost/cstdint.hpp~	2013-03-09 14:55:05.000000000 -0800
Petr Machata 830a7f
+++ boost_1_54_0/boost/cstdint.hpp	2013-07-15 13:19:07.344108660 -0700
Petr Machata 830a7f
@@ -41,7 +41,15 @@
Petr Machata 830a7f
 // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
Petr Machata 830a7f
 // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
Petr Machata 830a7f
 //
Petr Machata 830a7f
-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
Petr Machata 830a7f
+// This define has been dropped altogether in GLIBC 2.17.  As of then,
Petr Machata 830a7f
+// support for long long is part of baseline requirements, and
Petr Machata 830a7f
+// [u]int64_t is always defined.  See here:
Petr Machata 830a7f
+// http://sourceware.org/ml/libc-alpha/2013-01/msg00440.html
Petr Machata 830a7f
+//
Petr Machata 830a7f
+#if defined(BOOST_HAS_STDINT_H)					\
Petr Machata 830a7f
+  && (!defined(__GLIBC__)					\
Petr Machata 830a7f
+      || defined(__GLIBC_HAVE_LONG_LONG)			\
Petr Machata 830a7f
+      || (defined __GLIBC_PREREQ && __GLIBC_PREREQ(2,17)))
Petr Machata 830a7f
 
Petr Machata 830a7f
 // The following #include is an implementation artifact; not part of interface.
Petr Machata 830a7f
 # ifdef __hpux
Petr Machata 830a7f
Petr Machata 830a7f
Diff finished.  Mon Jul 15 13:19:50 2013