diff options
| author | Kai Tietz <ktietz@redhat.com> | 2012-11-29 10:36:41 +0100 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2012-11-29 10:36:41 +0100 |
| commit | e5a81c8e46da8597c3f757b8666074947552f8cc (patch) | |
| tree | 5a6a2c903a77a359f7e83eade2e215cf7c3deafe /libgcc/unwind-generic.h | |
| parent | 0abbfd21897f5c2f45d513d6d3212dae188e2bd7 (diff) | |
| download | gcc-e5a81c8e46da8597c3f757b8666074947552f8cc.zip gcc-e5a81c8e46da8597c3f757b8666074947552f8cc.tar.gz gcc-e5a81c8e46da8597c3f757b8666074947552f8cc.tar.bz2 | |
re PR target/55445 (Always defined __SEH__ when build from trunk)
PR target/55445
* unwind-c.c (__SEH__): Make sure SjLj isn't active.
* unwind-generic.h: Likewise.
* unwind-seh.c: Likewise.
From-SVN: r193928
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 c9c993b..95aee83 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, |