diff options
| author | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-29 09:36:41 +0000 |
|---|---|---|
| committer | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-29 09:36:41 +0000 |
| commit | a92cf445a6200e38e2aaf18d5181df017905cd46 (patch) | |
| tree | 5a6a2c903a77a359f7e83eade2e215cf7c3deafe /libgcc/unwind-generic.h | |
| parent | f67e2d48d4c6681dec397577a6a663e596881ab7 (diff) | |
| download | gcc-a92cf445a6200e38e2aaf18d5181df017905cd46.tar.gz | |
PR target/55445
* unwind-c.c (__SEH__): Make sure SjLj isn't active.
* unwind-generic.h: Likewise.
* unwind-seh.c: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193928 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgcc/unwind-generic.h')
| -rw-r--r-- | libgcc/unwind-generic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgcc/unwind-generic.h b/libgcc/unwind-generic.h index c9c993b2785..95aee831396 100644 --- a/libgcc/unwind-generic.h +++ b/libgcc/unwind-generic.h @@ -28,7 +28,7 @@ #ifndef _UNWIND_H #define _UNWIND_H -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) /* Only for _GCC_specific_handler. */ #include <windows.h> #endif @@ -275,7 +275,7 @@ extern void * _Unwind_FindEnclosingFunction (void *pc); # error "What type shall we use for _sleb128_t?" #endif -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) /* Handles the mapping from SEH to GCC interfaces. */ EXCEPTION_DISPOSITION _GCC_specific_handler (PEXCEPTION_RECORD, void *, PCONTEXT, PDISPATCHER_CONTEXT, |