[vlc-commits] contrib: gnutls: fix getenv on Android

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Jul 13 16:49:15 2016 +0200| [c9abe5ec6c8ef96d8c27c7368bcdaecd522f9715] | committer: Thomas Guillem

contrib: gnutls: fix getenv on Android

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

 contrib/src/gnutls/gnutls-android.patch |   11 +++++++++++
 contrib/src/gnutls/rules.mak            |    1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/gnutls/gnutls-android.patch b/contrib/src/gnutls/gnutls-android.patch
new file mode 100644
index 0000000..d816768
--- /dev/null
+++ b/contrib/src/gnutls/gnutls-android.patch
@@ -0,0 +1,11 @@
+--- gnutls.old/gl/secure_getenv.c	2016-07-13 16:36:42.095099707 +0200
++++ gnutls/gl/secure_getenv.c	2016-07-13 16:43:29.440899856 +0200
+@@ -24,7 +24,7 @@
+ #  include <unistd.h>
+ # else
+ #  undef issetugid
+-#  ifdef _WIN32
++#  if defined (_WIN32) || defined(__ANDROID__)
+ #   define issetugid() 0
+ #  else
+ #   define issetugid() 1
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index aacbaf5..70644c6 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -30,6 +30,7 @@ endif
 endif
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
+	$(APPLY) $(SRC)/gnutls/gnutls-android.patch
 endif
 	$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
 	$(APPLY) $(SRC)/gnutls/mac-keychain-lookup.patch