From 157060406355548fc38bd312e8607a530f032cd3 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 15 Feb 2013 18:58:30 +0100
Subject: [PATCH] Work around annoying boost-related compiler warning

---
 boost/boost/config/stdlib/libstdcpp3.hpp | 4 +++-
 status.20x                               | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/boost/boost/config/stdlib/libstdcpp3.hpp b/boost/boost/config/stdlib/libstdcpp3.hpp
index 815d605cc3..262ada00d4 100644
--- a/boost/boost/config/stdlib/libstdcpp3.hpp
+++ b/boost/boost/config/stdlib/libstdcpp3.hpp
@@ -39,7 +39,9 @@
       //
 #     define BOOST_HAS_THREADS
 #  else
-#     define BOOST_DISABLE_THREADS
+#    ifndef BOOST_DISABLE_THREADS
+#      define BOOST_DISABLE_THREADS
+#    endif
 #  endif
 #elif defined(__GLIBCPP__) \
         && !defined(_GLIBCPP_HAVE_GTHR_DEFAULT) \
diff --git a/status.20x b/status.20x
index 6a7489c8bd..6a2bd00bc9 100644
--- a/status.20x
+++ b/status.20x
@@ -181,3 +181,6 @@ What's new
 * BUILD/INSTALLATION
 
 - Fix building with system boost on FreeBSD.
+
+- Avoid annoying warnings with newer gcc versions.
+