diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-31 13:09:10 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-31 13:09:10 +0200 |
commit | 7a2d55a1943e51895d808e87f1766b44761a495a (patch) | |
tree | 9fc3e0520f9208f9bf909ac83c0f3c07aea595d4 /sal/osl | |
parent | 9329618eeec0aaa07b09197bec5e5bf266558d0f (diff) |
Fix Windows part of 97858ca008fd8cf405e52795c8db415ef6c5afb3
"tdf#93548 Refactor sal signal to reduce code duplication"
Change-Id: Ib0a872fb6023b6989c7931f4d57d911ddf76936f
Diffstat (limited to 'sal/osl')
-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 |
3 files changed, 3 insertions, 13 deletions
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() |