diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-10-05 10:15:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-10-05 10:15:26 +0200 |
| commit | 62c040e5ed827f1aa451b1169095d52db46fbc1c (patch) | |
| tree | 73485c9c5d68b2a9920c7ffd62e82e249abe1110 /vcl/win | |
| parent | f561531b69ae4870eaa9648f7c104cabcd0a7fa0 (diff) | |
Blind fix for MSVC warning C4211
..."nonstandard extension used: redefined extern to static", after the 'static'
in the friend declaration had to be removed for clang-cl with
e5d943d984bb0918f971eec45f45384cc0c72b67 "'static' is invalid in friend
declarations"
Change-Id: I14524ec0a5d8e7e12c5b506cbf7ac43508ae26ae
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/app/saltimer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx index e8d3e10d0b86..93b93fbb832f 100644 --- a/vcl/win/app/saltimer.cxx +++ b/vcl/win/app/saltimer.cxx @@ -26,7 +26,7 @@ #include <win/saltimer.h> #include <win/salinst.h> -static void CALLBACK SalTimerProc(PVOID pParameter, BOOLEAN bTimerOrWaitFired); +void CALLBACK SalTimerProc(PVOID pParameter, BOOLEAN bTimerOrWaitFired); // See http://msdn.microsoft.com/en-us/library/windows/desktop/ms687003%28v=vs.85%29.aspx // (and related pages) for details about the Timer Queues. @@ -122,7 +122,7 @@ void WinSalTimer::Stop() * This gets invoked from a Timer Queue thread. * Don't acquire the SolarMutex to avoid deadlocks. */ -static void CALLBACK SalTimerProc(PVOID data, BOOLEAN) +void CALLBACK SalTimerProc(PVOID data, BOOLEAN) { __try { |