diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-27 20:35:38 +0000 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-02-03 17:57:46 +0100 |
| commit | d534fb2ba429f8ddc368d1f4b6536e84a78f2a09 (patch) | |
| tree | cec7e33bca79b6be215328b4b998dd0e1a0f3781 | |
| parent | 48a36b901ee93302efef0d9e6c1e5751431a57fd (diff) | |
get this hack working for gcc 4.6.0
Signed-off-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | stlport/systemstlguards/preextstl.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h index 279f047bd..ac863a40a 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) |