diff options
author | Karl Berry <karl@freefriends.org> | 2021-12-17 16:42:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-12-17 16:42:00 +0000 |
commit | 3dbbfcc8ae8eafc123d1550de3c9a3ef8ba2ab0b (patch) | |
tree | a88a4807fdea71f2fbf9fdf32b1176ba14ee6266 /Build/source/texk/web2c/luatexdir | |
parent | f0766d14d2d278ee0a6479b62a45ec03461933d5 (diff) |
mingw patches from Siep and Luigi
git-svn-id: svn://tug.org/texlive/trunk@61335 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/luasocket/src/inet.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/luasocket/src/inet.h | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 6f218f96332..f6bb2158983 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2021-03-23 Siep Kroonenberg <siepo@bitmuis.nl> + *luasocket/src/inet.[ch] (inet_pton, inet_ntop) [_WS2TCPIP_H_]: + don't define fns if _WS2TCPIP_H_ is defined; for mingw. + https://tug.org/pipermail/tlbuild/2021q4/004980.html + 2021-04-21 Luigi Scarso <luigi.scarso@gmail.com> *\discretionaryligaturemode: optionally block select disc creation (see [Dev-luatex] [PATCH] Nested discretionaries M.F. Krüger) (HH) diff --git a/Build/source/texk/web2c/luatexdir/luasocket/src/inet.c b/Build/source/texk/web2c/luatexdir/luasocket/src/inet.c index f4c84044eb7..5df3d9d5ebe 100644 --- a/Build/source/texk/web2c/luatexdir/luasocket/src/inet.c +++ b/Build/source/texk/web2c/luatexdir/luasocket/src/inet.c @@ -519,6 +519,7 @@ int inet_aton(const char *cp, struct in_addr *inp) #endif #ifdef LUASOCKET_INET_PTON +#ifndef _WS2TCPIP_H_ int inet_pton(int af, const char *src, void *dst) { struct addrinfo hints, *res; @@ -541,3 +542,4 @@ int inet_pton(int af, const char *src, void *dst) } #endif +#endif diff --git a/Build/source/texk/web2c/luatexdir/luasocket/src/inet.h b/Build/source/texk/web2c/luatexdir/luasocket/src/inet.h index 928c7eb407e..829526d0872 100644 --- a/Build/source/texk/web2c/luatexdir/luasocket/src/inet.h +++ b/Build/source/texk/web2c/luatexdir/luasocket/src/inet.h @@ -47,8 +47,10 @@ int inet_aton(const char *cp, struct in_addr *inp); #endif #ifdef LUASOCKET_INET_PTON +#ifndef _WS2TCPIP_H_ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); int inet_pton(int af, const char *src, void *dst); #endif +#endif #endif /* INET_H */ |