[vlc-commits] contrib: gnutls: Remove unneeded patch

Hugo Beauzée-Luyssen git at videolan.org
Fri Jun 26 12:34:45 CEST 2020


vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Dec 10 17:34:28 2018 +0100| [3160c818b298774319aef841591ef8c1c5f2d6f2] | committer: Steve Lhomme

contrib: gnutls: Remove unneeded patch

SIZE_MAX is in stdint.h, which is already included

(cherry picked from commit 0878789f35c42a9fae823174a1d257e89a679e64)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=3160c818b298774319aef841591ef8c1c5f2d6f2
---

 contrib/src/gnutls/read-file-limits.h.patch | 12 ------------
 contrib/src/gnutls/rules.mak                |  1 -
 2 files changed, 13 deletions(-)

diff --git a/contrib/src/gnutls/read-file-limits.h.patch b/contrib/src/gnutls/read-file-limits.h.patch
deleted file mode 100644
index b13b1a88f4..0000000000
--- a/contrib/src/gnutls/read-file-limits.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gnutls/gl/read-file.c.orig	2012-03-06 20:59:29.600593329 -0500
-+++ gnutls/gl/read-file.c	2012-03-06 20:59:44.568593328 -0500
-@@ -35,6 +35,9 @@
- /* Get errno. */
- #include <errno.h>
- 
-+/* Get SIZE_MAX */
-+#include <limits.h>
-+
- /* Read a STREAM and return a newly allocated string with the content,
-    and set *LENGTH to the length of the string.  The string is
-    zero-terminated, but the terminating zero byte is not counted in
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 1c60b7e501..5bfb40b3b0 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -26,7 +26,6 @@ endif
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
 endif
-	$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
 ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/gnutls/gnutls-disable-getentropy-osx.patch
 	$(APPLY) $(SRC)/gnutls/gnutls-disable-connectx-macos.patch



More information about the vlc-commits mailing list