[Libreoffice-commits] .: stlport/systemstlguards
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jan 27 12:35:45 PST 2011
stlport/systemstlguards/preextstl.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit eb54ecb4bfb9337853db318d2c2b12b201262ed9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 27 20:35:38 2011 +0000
get this hack working for gcc 4.6.0
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
index d0ee030..bdf7cb0 100644
--- a/stlport/systemstlguards/preextstl.h
+++ b/stlport/systemstlguards/preextstl.h
@@ -48,7 +48,13 @@
# if defined(_GNUC__)
# pragma GCC visibility push(default)
# endif
-# include _STLP_NATIVE_HEADER(exception_defines.h)
+//Do we still need to include exception_defines.h here, I'd prefer
+//to drop it if possible
+# if (__GNUC__ >= 5 || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)))
+# include _STLP_NATIVE_HEADER(bits/exception_defines.h)
+# else
+# include _STLP_NATIVE_HEADER(exception_defines.h)
+# endif
# include _STLP_NATIVE_HEADER(limits)
# if !defined(__GXX_EXPERIMENTAL_CXX0X__)
# include _STLP_NATIVE_HEADER(memory)
More information about the Libreoffice-commits
mailing list