diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-27 20:35:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-27 20:35:38 +0000 |
| commit | 07d72ea00a011891c943a12a04c9a15800b97d66 (patch) | |
| tree | 337c14625dceb9b149d13fc35d0d17d0da25aa59 /stlport | |
| parent | 9f60dbeef801446cb364e0624820a00e8a275d35 (diff) | |
get this hack working for gcc 4.6.0
Diffstat (limited to 'stlport')
| -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 d0ee030491e8..bdf7cb0cfbb8 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) # if !defined(__GXX_EXPERIMENTAL_CXX0X__) # include _STLP_NATIVE_HEADER(memory) |