Define WIN32_LEAN_AND_MEAN to avoid collision with winsock2

gfx/common/d3d10_common.c

@@ -14,6 +14,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 
 #include "d3d10_defines.h"
 #include "d3dcompiler_common.h"

gfx/common/d3d11_common.c

@@ -14,6 +14,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 
 #include <string.h>
 

gfx/common/win32_common.c

@@ -15,6 +15,8 @@
 
 #if !defined(_XBOX)
 
+#define WIN32_LEAN_AND_MEAN
+
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0601 /* Windows 7 */
 #endif

gfx/display_servers/dispserv_win32.c

@@ -15,6 +15,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define WIN32_LEAN_AND_MEAN
+
 /* VC6 needs objbase included before initguid, but nothing else does */
 #include <objbase.h>
 #include <initguid.h>

gfx/drivers/d3d10.c

@@ -22,6 +22,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 #define COBJMACROS
 
 #include <string.h>

gfx/drivers/d3d12.c

@@ -22,6 +22,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 
 #include <string.h>
 #include <malloc.h>

gfx/drivers_context/w_vk_ctx.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include <math.h>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commdlg.h>
 

gfx/drivers_context/wgl_ctx.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include <math.h>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commdlg.h>
 

gfx/drivers_font/d3d9x_w32_font.c

@@ -15,6 +15,7 @@
  */
 
 #define CINTERFACE
+#define WIN32_LEAN_AND_MEAN
 
 #include <tchar.h>
 

input/drivers/dinput.c

@@ -18,6 +18,8 @@
 #pragma comment(lib, "dinput8")
 #endif
 
+#define WIN32_LEAN_AND_MEAN
+
 #undef DIRECTINPUT_VERSION
 #define DIRECTINPUT_VERSION 0x0800
 

input/drivers/winraw_input.c

@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #ifdef CXX_BUILD

input/drivers_joypad/dinput_joypad.c

@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windowsx.h>
 
 #include <dinput.h>

tasks/task_content.c

@@ -32,6 +32,7 @@
 #else
 #include <io.h>
 #include <fcntl.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 #endif