diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-01-25 21:34:04 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-01-25 21:34:04 +0000 |
| commit | 84794a9bc390c6c3ce167c9dbd8ca8c4cf33fc6d (patch) | |
| tree | 9eb65421e6334619050bacc94190ce13128253d3 /epan/dissectors/packet-frame.c | |
| parent | 7b16b24e72ab610a0e362e178380b9fb7d177db9 (diff) | |
from Gisle Vanem:
This file uses SEH which AFAIK is only available for MS Visual-C.
I build using MingW/gcc, so the attached patch is needed.
svn path=/trunk/; revision=17102
Diffstat (limited to 'epan/dissectors/packet-frame.c')
| -rw-r--r-- | epan/dissectors/packet-frame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 5a7efd4ac9..386b7b449d 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -268,8 +268,8 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* Portable Exception Handling to trap Ethereal specific exceptions like BoundsError exceptions */ TRY { -#ifdef _WIN32 - /* WIN32 Structured Exception Handling (SEH) to trap hardware exceptions like memory access violations */ +#ifdef _MSC_VER + /* Win32: Visual-C Structured Exception Handling (SEH) to trap hardware exceptions like memory access violations */ /* (a running debugger will be called before the except part below) */ __try { #endif @@ -283,7 +283,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) pinfo->fd->lnk_t); call_dissector(data_handle,tvb, pinfo, parent_tree); } -#ifdef _WIN32 +#ifdef _MSC_VER } __except(TRUE /* handle all exceptions */) { switch(GetExceptionCode()) { case(STATUS_ACCESS_VIOLATION): |