X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fmono-signal-handler.h;h=fbe798eeb0e6321667023429bfc88b4cb65bb1ce;hb=87a2e8742e14007da3126d6577fce6796d1e165d;hp=92cb299a15023ced10adeef5e568f6fa7effcc6d;hpb=8410c9bb00a738a105ed416aae0ddd6e6bfd7523;p=mono.git diff --git a/mono/utils/mono-signal-handler.h b/mono/utils/mono-signal-handler.h index 92cb299a150..fbe798eeb0e 100644 --- a/mono/utils/mono-signal-handler.h +++ b/mono/utils/mono-signal-handler.h @@ -26,7 +26,7 @@ * To define a signal handler function: * MONO_SIG_HANDLER_FUNC(access, name) * To call another signal handler function: - * handler_func (SIG_HANDLER_PARAMS); + * handler_func (MONO_SIG_HANDLER_PARAMS); * To obtain the signal number: * int signo = MONO_SIG_HANDLER_GET_SIGNO (); * To obtain the signal context: @@ -35,19 +35,23 @@ */ #ifdef HOST_WIN32 -#define MONO_SIG_HANDLER_SIGNATURE(ftn) ftn (int _dummy, EXCEPTION_POINTERS *info, void *context) -#define MONO_SIG_HANDLER_FUNC(access, ftn) MONO_SIGNAL_HANDLER_FUNC (access, ftn, (int _dummy, EXCEPTION_POINTERS *info, void *context)) -#define MONO_SIG_HANDLER_PARAMS _dummy, info, context +#define MONO_SIG_HANDLER_SIGNATURE(ftn) ftn (int _dummy, EXCEPTION_POINTERS *_info, void *context) +#define MONO_SIG_HANDLER_FUNC(access, ftn) MONO_SIGNAL_HANDLER_FUNC (access, ftn, (int _dummy, EXCEPTION_POINTERS *_info, void *context)) +#define MONO_SIG_HANDLER_PARAMS _dummy, _info, context #define MONO_SIG_HANDLER_GET_SIGNO() (_dummy) +#define MONO_SIG_HANDLER_GET_INFO() (_info) +#define MONO_SIG_HANDLER_INFO_TYPE EXCEPTION_POINTERS /* seh_vectored_exception_handler () passes in a CONTEXT* */ #define MONO_SIG_HANDLER_GET_CONTEXT \ void *ctx = context; #else /* sigaction */ -#define MONO_SIG_HANDLER_SIGNATURE(ftn) ftn (int _dummy, siginfo_t *info, void *context) -#define MONO_SIG_HANDLER_FUNC(access, ftn) MONO_SIGNAL_HANDLER_FUNC (access, ftn, (int _dummy, siginfo_t *info, void *context)) -#define MONO_SIG_HANDLER_PARAMS _dummy, info, context +#define MONO_SIG_HANDLER_SIGNATURE(ftn) ftn (int _dummy, siginfo_t *_info, void *context) +#define MONO_SIG_HANDLER_FUNC(access, ftn) MONO_SIGNAL_HANDLER_FUNC (access, ftn, (int _dummy, siginfo_t *_info, void *context)) +#define MONO_SIG_HANDLER_PARAMS _dummy, _info, context #define MONO_SIG_HANDLER_GET_SIGNO() (_dummy) +#define MONO_SIG_HANDLER_GET_INFO() (_info) +#define MONO_SIG_HANDLER_INFO_TYPE siginfo_t #define MONO_SIG_HANDLER_GET_CONTEXT \ void *ctx = context; #endif