[libreoffice] give another try at this
Caolan McNamara
caolanm at fedoraproject.org
Thu Jan 27 15:02:46 UTC 2011
commit 0176787b0fb906672e2f0d7ae1d40a92b6df2123
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 27 15:02:36 2011 +0000
give another try at this
0001-fexceptions-fexceptions.patch | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
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)
More information about the scm-commits
mailing list