From 361a88f4b944d1ea0b18b859f0130810addc6200 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 19 Mar 2004 08:48:47 +0000 Subject: [PATCH] no GetSignalBacktraceContext or CrashSignalHandler on DARWIN --- stepmania/src/archutils/Unix/Backtrace.h | 2 ++ stepmania/src/archutils/Unix/CrashHandler.cpp | 2 ++ stepmania/src/archutils/Unix/CrashHandler.h | 10 ++++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/stepmania/src/archutils/Unix/Backtrace.h b/stepmania/src/archutils/Unix/Backtrace.h index 78414e7577..68bc4b6dc5 100644 --- a/stepmania/src/archutils/Unix/Backtrace.h +++ b/stepmania/src/archutils/Unix/Backtrace.h @@ -34,8 +34,10 @@ void GetCurrentBacktraceContext( BacktraceContext *ctx ); /* Set up a BacktraceContext to get a backtrace after receiving a signal, given * a ucontext_t (see sigaction(2)). (This interface is UNIX-specific.) */ +#if !defined(DARWIN) #include void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc ); +#endif #if defined(DARWIN) #include diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp index 75840d5f91..914aaece99 100644 --- a/stepmania/src/archutils/Unix/CrashHandler.cpp +++ b/stepmania/src/archutils/Unix/CrashHandler.cpp @@ -337,6 +337,7 @@ void ForceCrashHandler( const char *reason ) RunCrashHandler( &crash ); } +#if !defined(DARWIN) void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc ) { CrashData crash; @@ -347,6 +348,7 @@ void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc ) GetSignalBacktraceContext( &crash.ctx, uc ); RunCrashHandler( &crash ); } +#endif #if defined(DARWIN) OSStatus CrashExceptionHandler( ExceptionInformation *e ) diff --git a/stepmania/src/archutils/Unix/CrashHandler.h b/stepmania/src/archutils/Unix/CrashHandler.h index 873aceeb65..1d4c6ef2b6 100644 --- a/stepmania/src/archutils/Unix/CrashHandler.h +++ b/stepmania/src/archutils/Unix/CrashHandler.h @@ -1,14 +1,16 @@ #ifndef CRASH_HANDLER_H #define CRASH_HANDLER_H -#include -#include - void ForceCrashHandler( const char *reason ); -void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc ); void CrashHandlerHandleArgs( int argc, char* argv[] ); void InitializeCrashHandler(); +#if !defined(DARWIN) +#include +#include +void CrashSignalHandler( int signal, siginfo_t *si, const ucontext_t *uc ); +#endif + #if defined(DARWIN) #include OSStatus CrashExceptionHandler( ExceptionInformation *e );