[Libreoffice-commits] core.git: vcl/inc

[Stephan Bergmann]

 vcl/inc/win/saltimer.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e5d943d984bb0918f971eec45f45384cc0c72b67
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 5 09:44:37 2017 +0200

    'static' is invalid in friend declarations
    
    Change-Id: I993e4dd219e247ca33022010da350f565c5e0dcf

diff --git a/vcl/inc/win/saltimer.h b/vcl/inc/win/saltimer.h
index 06e77b171cb3..5ad6a1718f19 100644
--- a/vcl/inc/win/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -27,7 +27,7 @@ class WinSalTimer final : public SalTimer, protected VersionedEvent
     // for access to Impl* functions
     friend LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef );
     // for access to m_bPollForMessage
-    friend static void CALLBACK SalTimerProc( PVOID data, BOOLEAN );
+    friend void CALLBACK SalTimerProc( PVOID data, BOOLEAN );
 
     HANDLE       m_nTimerId;          ///< Windows timer id
     bool         m_bPollForMessage;   ///< Run yield until a message is caught (most likely the 0ms timer)