[vlc-commits] contrib/gpg-error: fix compilation for embedded 64bit Darwin platforms

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Aug 17 22:15:39 2014 +0200| [03efc84b372f73e29b66c9b2b03d7d391c34d635] | committer: Felix Paul Kühne

contrib/gpg-error: fix compilation for embedded 64bit Darwin platforms

(cherry picked from commit e14eb8f3f6799fe02f9bed2b67e5b0702e4e799a)

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

 contrib/src/gpg-error/missing-unistd-include.patch |   11 +++++++++++
 contrib/src/gpg-error/rules.mak                    |    1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/gpg-error/missing-unistd-include.patch b/contrib/src/gpg-error/missing-unistd-include.patch
new file mode 100644
index 0000000..19dc806
--- /dev/null
+++ b/contrib/src/gpg-error/missing-unistd-include.patch
@@ -0,0 +1,11 @@
+diff -ru libgpg-error/tests/t-lock.c libgpg-error-fixed/tests/t-lock.c
+--- libgpg-error/tests/t-lock.c	2014-01-24 21:50:09.000000000 +0100
++++ libgpg-error-fixed/tests/t-lock.c	2014-08-17 22:10:24.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <assert.h>
+ #ifdef _WIN32
+ # include <windows.h>
diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index e7ff25c..eef30c9 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -12,6 +12,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/gpg-error/windres-make.patch
 endif
+	$(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch
 	$(MOVE)
 	cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h
 ifdef HAVE_IOS