diff options
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) |