[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: upnp: remove windows-version-inet patch

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
4ef05543 by Johannes Kauffmann at 2023-08-27T08:18:32+00:00
contrib: upnp: remove windows-version-inet patch

This was fixes upstream by 44cdeeb70db9112be132a4fb5b21d0cb8d57acaf.

- - - - -
8c56a836 by Johannes Kauffmann at 2023-08-27T08:18:32+00:00
contrib: upnp: remove strerror_s patch

The function has a declaration in MinGW headers since v3.0.0, thus this
patch should not be needed anymore.

- - - - -


3 changed files:

- − contrib/src/upnp/libupnp-win32.patch
- contrib/src/upnp/rules.mak
- − contrib/src/upnp/windows-version-inet.patch


Changes:

=====================================
contrib/src/upnp/libupnp-win32.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/upnp/src/inc/upnputil.h b/upnp/src/inc/upnputil.h
-index 2f18422b..ffc79254 100644
---- a/upnp/src/inc/upnputil.h
-+++ b/upnp/src/inc/upnputil.h
-@@ -106,7 +106,7 @@ void linecopylen(
- 		#endif
- 		#define sleep(a) Sleep((a)*1000)
- 		#define usleep(a) Sleep((a) / 1000)
--		#define strerror_r(a, b, c) (strerror_s((b), (c), (a)))
-+		#define strerror_r(a, b, c) strncpy(b, strerror(a), c)
- 	#else
- 		#define max(a, b) (((a) > (b)) ? (a) : (b))
- 		#define min(a, b) (((a) < (b)) ? (a) : (b))


=====================================
contrib/src/upnp/rules.mak
=====================================
@@ -31,10 +31,6 @@ endif
 
 upnp: pupnp-release-$(UPNP_VERSION).tar.gz .sum-upnp
 	$(UNPACK)
-ifdef HAVE_WIN32
-	$(APPLY) $(SRC)/upnp/libupnp-win32.patch
-	$(APPLY) $(SRC)/upnp/windows-version-inet.patch
-endif
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/upnp/revert-ifaddrs.patch
 else


=====================================
contrib/src/upnp/windows-version-inet.patch deleted
=====================================
@@ -1,65 +0,0 @@
-From a66d4779723f9aef75622157c76f5dc1ed1a33a3 Mon Sep 17 00:00:00 2001
-From: Alaric Senat <dev.asenat at posteo.net>
-Date: Wed, 10 Mar 2021 15:59:43 +0100
-Subject: windows version inet
-
----
- upnp/src/inc/inet_pton.h | 6 ++++++
- upnp/src/inet_pton.c     | 5 +++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/upnp/src/inc/inet_pton.h b/upnp/src/inc/inet_pton.h
-index f3e08a5..e6233b5 100644
---- a/upnp/src/inc/inet_pton.h
-+++ b/upnp/src/inc/inet_pton.h
-@@ -3,6 +3,8 @@
- 
- #ifdef _WIN32
- 
-+#include "autoconfig.h"
-+
-	#ifdef IPV6_
-		#define INET_IPV6
-	#endif
-@@ -13,6 +15,8 @@
- #include <stdio.h>
- #include <string.h>
- 
-+#if _WIN32_WINNT < 0x600
-+
- /*!
-  * \file
-  *
-@@ -45,6 +49,8 @@ extern const char *inet_ntop(int af, const void *src, char *dst,
-  */
- extern int inet_pton(int af, const char *src, void *dst);
- 
-+#endif /* _WIN32_WINNT < 0x600 */
-+
- #endif /* _WIN32 */
- 
- #endif /* INET_PTON */
-diff --git a/upnp/src/inet_pton.c b/upnp/src/inet_pton.c
-index e2a243b..73c0a16 100644
---- a/upnp/src/inet_pton.c
-+++ b/upnp/src/inet_pton.c
-@@ -24,6 +24,9 @@
- 
- 	#include "inet_pton.h"
- 
-+#if _WIN32_WINNT < 0x600
-+
-+
- /*!
-  * \brief format an IPv4 address
-  *
-@@ -324,4 +327,6 @@ int inet_pton(int af, const char *src, void *dst)
- 	/* NOTREACHED */
- }
- 
-+#endif /* _WIN32_WINNT < 0x600 */
-+
- #endif /* _WIN32 */
--- 
-2.29.2
-



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1a2a3015f3da76d404867554bb853cc03db4c415...8c56a836f30a55469ffa81afad5c67aafb8f1b8a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1a2a3015f3da76d404867554bb853cc03db4c415...8c56a836f30a55469ffa81afad5c67aafb8f1b8a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance