Skip to content

Commit c6995c0

Browse files
Merge pull request #17801 from pstef/win32-socket
2 parents a3ba931 + d6cc184 commit c6995c0

15 files changed

Lines changed: 24 additions & 3 deletions

File tree

gfx/common/d3d10_common.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515

1616
#define CINTERFACE
17+
#define WIN32_LEAN_AND_MEAN
1718

1819
#include "d3d10_defines.h"
1920
#include "d3dcompiler_common.h"

gfx/common/d3d11_common.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515

1616
#define CINTERFACE
17+
#define WIN32_LEAN_AND_MEAN
1718

1819
#include <string.h>
1920

gfx/common/win32_common.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
#if !defined(_XBOX)
1717

18+
#define WIN32_LEAN_AND_MEAN
19+
1820
#ifndef _WIN32_WINNT
1921
#define _WIN32_WINNT 0x0601 /* Windows 7 */
2022
#endif

gfx/display_servers/dispserv_win32.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18+
#define WIN32_LEAN_AND_MEAN
19+
1820
/* VC6 needs objbase included before initguid, but nothing else does */
1921
#include <objbase.h>
2022
#include <initguid.h>

gfx/drivers/d3d10.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*/
2323

2424
#define CINTERFACE
25+
#define WIN32_LEAN_AND_MEAN
2526
#define COBJMACROS
2627

2728
#include <string.h>

gfx/drivers/d3d12.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*/
2323

2424
#define CINTERFACE
25+
#define WIN32_LEAN_AND_MEAN
2526

2627
#include <string.h>
2728
#include <malloc.h>

gfx/drivers_context/w_vk_ctx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <string.h>
3030
#include <math.h>
3131

32+
#define WIN32_LEAN_AND_MEAN
3233
#include <windows.h>
3334
#include <commdlg.h>
3435

gfx/drivers_context/wgl_ctx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <string.h>
3030
#include <math.h>
3131

32+
#define WIN32_LEAN_AND_MEAN
3233
#include <windows.h>
3334
#include <commdlg.h>
3435

gfx/drivers_font/d3d9x_w32_font.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616

1717
#define CINTERFACE
18+
#define WIN32_LEAN_AND_MEAN
1819

1920
#include <tchar.h>
2021

input/drivers/dinput.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#pragma comment(lib, "dinput8")
1919
#endif
2020

21+
#define WIN32_LEAN_AND_MEAN
22+
2123
#undef DIRECTINPUT_VERSION
2224
#define DIRECTINPUT_VERSION 0x0800
2325

0 commit comments

Comments
 (0)