Skip to content

Commit 312edb7

Browse files
authored
make mingw happy (#182)
Storage class specifiers are not allowed in friend declarations. Maybe it's a MSVC dialect.
1 parent 8b1a95d commit 312edb7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

highgui/src/display_win32.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static inline void safeReleaseArray(T* &array) {
4343
array = nullptr;
4444
}
4545

46-
static LRESULT CALLBACK __globalWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
46+
LRESULT CALLBACK __globalWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
4747
{
4848
if (g_wndBeingCreated) {
4949
g_wndBeingCreated->m_hWnd = hWnd;

highgui/src/display_win32.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#pragma once
1818

19-
#include <Windows.h>
19+
#include <windows.h>
2020

2121
class SimpleWindow
2222
{
@@ -25,7 +25,7 @@ class SimpleWindow
2525
virtual LRESULT windowProc(UINT msg, WPARAM wParam, LPARAM lParam);
2626

2727
public:
28-
friend static LRESULT CALLBACK __globalWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
28+
friend LRESULT CALLBACK __globalWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
2929

3030
static double getDesktopDpiFactor();
3131

0 commit comments

Comments
 (0)