diff options
-rw-r--r-- | sal/inc/internal/signalshared.hxx | 5 | ||||
-rw-r--r-- | sal/osl/all/signalshared.cxx | 12 | ||||
-rw-r--r-- | sal/osl/unx/signal.cxx | 2 | ||||
-rw-r--r-- | sal/osl/w32/signal.cxx | 2 |
4 files changed, 4 insertions, 17 deletions
diff --git a/sal/inc/internal/signalshared.hxx b/sal/inc/internal/signalshared.hxx index 07f997626e89..3eaa32c63788 100644 --- a/sal/inc/internal/signalshared.hxx +++ b/sal/inc/internal/signalshared.hxx @@ -30,18 +30,15 @@ struct oslSignalHandlerImpl oslSignalHandlerImpl* pNext; }; -typedef void (*ErrorReportingChangedHandler)(bool); - extern bool bErrorReportingEnabled; extern bool bInitSignal; -void setErrorReportingChangedHandler(ErrorReportingChangedHandler handler); - oslSignalAction callSignalHandler(oslSignalInfo* pInfo); // platform-specific functions that need to be implemented bool onInitSignal(); bool onDeInitSignal(); +void onErrorReportingChanged(bool enabled); #endif diff --git a/sal/osl/all/signalshared.cxx b/sal/osl/all/signalshared.cxx index fcafacdb78bf..f444f37afd50 100644 --- a/sal/osl/all/signalshared.cxx +++ b/sal/osl/all/signalshared.cxx @@ -31,8 +31,6 @@ namespace oslSignalHandlerImpl* SignalList; oslMutex SignalListMutex; -ErrorReportingChangedHandler errorReportingChangedHandler; - bool initSignal() { SignalListMutex = osl_createMutex(); @@ -51,11 +49,6 @@ bool deInitSignal() } -void setErrorReportingChangedHandler(ErrorReportingChangedHandler handler) -{ - errorReportingChangedHandler = handler; -} - oslSignalAction callSignalHandler(oslSignalInfo* pInfo) { oslSignalHandlerImpl* pHandler = SignalList; @@ -167,10 +160,7 @@ sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable ) { bool bOld = bErrorReportingEnabled; bErrorReportingEnabled = bEnable; - - if (errorReportingChangedHandler) - errorReportingChangedHandler(bEnable); - + onErrorReportingChanged(bEnable); return bOld; } diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx index 7f864568a402..73bb19d61e81 100644 --- a/sal/osl/unx/signal.cxx +++ b/sal/osl/unx/signal.cxx @@ -281,6 +281,8 @@ bool onDeInitSignal() return false; } +void onErrorReportingChanged(SAL_UNUSED_PARAMETER bool) {} + namespace { void printStack(int sig) diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index 3c7c47b35643..d4a7967fba03 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -42,8 +42,6 @@ namespace { long WINAPI signalHandlerFunction(LPEXCEPTION_POINTERS lpEP); - -void onErrorReportingChanged(bool bEnable); } bool onInitSignal() |