[Libreoffice-commits] .: Branch 'libreoffice-3-3' - stlport/systemstlguards

[David Tardon]

 stlport/systemstlguards/preextstl.h |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d534fb2ba429f8ddc368d1f4b6536e84a78f2a09
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
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
index 279f047..ac863a4 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)
 #       include _STLP_NATIVE_HEADER(memory)
 #       include _STLP_NATIVE_HEADER(exception)