aha, weird ass include magic required

f41
Caolán McNamara 14 years ago
parent 80e98efe41
commit ca77b4bea9

@ -33,16 +33,35 @@ diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preex
index d0ee030..5ff8668 100644
--- a/stlport/systemstlguards/preextstl.h
+++ b/stlport/systemstlguards/preextstl.h
@@ -48,7 +48,11 @@
@@ -48,7 +48,6 @@
# if defined(_GNUC__)
# pragma GCC visibility push(default)
# endif
-# include _STLP_NATIVE_HEADER(exception_defines.h)
+# 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)
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 044dfc5..1d28d05 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -32,9 +32,10 @@
#include <stdio.h>
#include <string.h>
#include <dlfcn.h>
-#include <cxxabi.h>
#include <hash_map>
+#include <cxxabi.h>
+
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
@@ -47,7 +48,6 @@
#include "share.hxx"
-
using namespace ::std;
using namespace ::osl;
using namespace ::rtl;

Loading…
Cancel
Save