From 96f1bec8e4e4f0bbeaae06caea1c85f378b00422 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 12 Nov 2014 23:51:49 -0500 Subject: sdl[2]_net: Fix winsocks2.h include The problem didn't manifest itself until https://github.com/mirror/mingw-w64/commit/9bd8fe9148924840d315b4c915dd099955ea89d1 (included in MinGW-w64 3.3.0). Fixes #550. Signed-off-by: Timothy Gu --- src/sdl2_net-1-winsocks2.patch | 26 ++++++++++++++++++++++++++ src/sdl_net-2-winsocks2.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 src/sdl2_net-1-winsocks2.patch create mode 100644 src/sdl_net-2-winsocks2.patch diff --git a/src/sdl2_net-1-winsocks2.patch b/src/sdl2_net-1-winsocks2.patch new file mode 100644 index 0000000..9d4376d --- /dev/null +++ b/src/sdl2_net-1-winsocks2.patch @@ -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 +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 + +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 + #include + #else +-- +1.9.1 + diff --git a/src/sdl_net-2-winsocks2.patch b/src/sdl_net-2-winsocks2.patch new file mode 100644 index 0000000..9d4376d --- /dev/null +++ b/src/sdl_net-2-winsocks2.patch @@ -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 +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 + +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 + #include + #else +-- +1.9.1 + -- cgit v0.12