d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdl[2]_net: Fix winsocks2.h include 

The problem didn't manifest itself until 9bd8fe9148
(included in MinGW-w64 3.3.0).

Fixes #550.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
Timothy Gu 2014-11-12 23:51:49 -05:00
parent 13d4a29728
commit 96f1bec8e4
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/sdl2_net-1-winsocks2.patch Normal file
View File

@ -0,0 +1,26 @@
This file is part of MXE.
See index.html for further information.
From 68e75d3818547ee17f1a67283d655bee51e59568 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Wed, 12 Nov 2014 23:44:05 -0500
Subject: [PATCH] SDLnetsys: Fix winsocks2.h include on i686-w64-mingw32
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/SDLnetsys.h b/SDLnetsys.h
index f5f4714..e2252d6 100644
--- a/SDLnetsys.h
+++ b/SDLnetsys.h
@@ -34,7 +34,7 @@
/* Include system network headers */
#if defined(__WIN32__) || defined(WIN32)
#define __USE_W32_SOCKETS
-#ifdef _WIN64
+#if defined(_WIN64) || defined(__MINGW64_VERSION_MAJOR)
#include <winsock2.h>
#include <ws2tcpip.h>
#else
--
1.9.1

26
src/sdl_net-2-winsocks2.patch Normal file
View File

@ -0,0 +1,26 @@
This file is part of MXE.
See index.html for further information.
From 68e75d3818547ee17f1a67283d655bee51e59568 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Wed, 12 Nov 2014 23:44:05 -0500
Subject: [PATCH] SDLnetsys: Fix winsocks2.h include on i686-w64-mingw32
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/SDLnetsys.h b/SDLnetsys.h
index f5f4714..e2252d6 100644
--- a/SDLnetsys.h
+++ b/SDLnetsys.h
@@ -34,7 +34,7 @@
/* Include system network headers */
#if defined(__WIN32__) || defined(WIN32)
#define __USE_W32_SOCKETS
-#ifdef _WIN64
+#if defined(_WIN64) || defined(__MINGW64_VERSION_MAJOR)
#include <winsock2.h>
#include <ws2tcpip.h>
#else
--
1.9.1