From 0176787b0fb906672e2f0d7ae1d40a92b6df2123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 27 Jan 2011 15:02:36 +0000 Subject: [PATCH] give another try at this --- 0001-fexceptions-fexceptions.patch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/0001-fexceptions-fexceptions.patch b/0001-fexceptions-fexceptions.patch index 954acc3..749b6e9 100644 --- a/0001-fexceptions-fexceptions.patch +++ b/0001-fexceptions-fexceptions.patch @@ -33,11 +33,16 @@ 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,6 @@ +@@ -48,7 +48,11 @@ # 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)