diff options
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/luasocket/src/wsocket.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index a71ee87988a..23de211ca29 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-07-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * luasocket/src/wsocket.h: Avoid redefinition of _WIN32_WINNT. + 2014-07-11 Peter Breitenlohner <peb@mppmu.mpg.de> * am/libluatex.am: Compiling liblua(jit)tex.a requires mplib.h; diff --git a/Build/source/texk/web2c/luatexdir/luasocket/src/wsocket.h b/Build/source/texk/web2c/luatexdir/luasocket/src/wsocket.h index 2a1db71a80e..624dd79bf17 100644 --- a/Build/source/texk/web2c/luatexdir/luasocket/src/wsocket.h +++ b/Build/source/texk/web2c/luatexdir/luasocket/src/wsocket.h @@ -8,7 +8,7 @@ /*=========================================================================*\ * WinSock include files \*=========================================================================*/ -#if defined(__MINGW32__) +#if defined(__MINGW32__) && (!defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501)) #define _WIN32_WINNT 0x0501 #endif #include <winsock2.h> |