Skip to content

Commit ca9ffe0

Browse files
authored
Merge pull request #20134 from halx99/patch-1
Fix include order for Win32.
2 parents f0cdd02 + 4439b6b commit ca9ffe0

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

cocos/platform/win32/CCStdC-win32.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ typedef SSIZE_T ssize_t;
9797
#ifndef NOMINMAX
9898
#define NOMINMAX
9999
#endif
100-
// Structure timeval has define in winsock.h, include windows.h for it.
101-
#include <Windows.h>
102100

103101
#ifndef __MINGW32__
104102

105103
#include <WinSock2.h>
104+
// Structure timeval has define in winsock.h, include windows.h for it.
105+
#include <Windows.h>
106106

107107
NS_CC_BEGIN
108108

@@ -120,6 +120,7 @@ NS_CC_END
120120

121121
#undef _WINSOCKAPI_
122122
#include <winsock2.h>
123+
#include <Windows.h>
123124

124125
// Conflicted with math.h isnan
125126
#include <cmath>

0 commit comments

Comments
 (0)