Kaydet (Commit) 62c040e5 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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
e5d943d9 "'static' is invalid in friend
declarations"

Change-Id: I14524ec0a5d8e7e12c5b506cbf7ac43508ae26ae
üst f561531b
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <win/saltimer.h> #include <win/saltimer.h>
#include <win/salinst.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 // 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. // (and related pages) for details about the Timer Queues.
...@@ -122,7 +122,7 @@ void WinSalTimer::Stop() ...@@ -122,7 +122,7 @@ void WinSalTimer::Stop()
* This gets invoked from a Timer Queue thread. * This gets invoked from a Timer Queue thread.
* Don't acquire the SolarMutex to avoid deadlocks. * Don't acquire the SolarMutex to avoid deadlocks.
*/ */
static void CALLBACK SalTimerProc(PVOID data, BOOLEAN) void CALLBACK SalTimerProc(PVOID data, BOOLEAN)
{ {
__try __try
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment