vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Wed May 16 
22:11:52 2018 +0200| [fc8d891c64409f833f6205075ddb41215b0b71ee] | committer: 
Steve Lhomme

contrib: pthreads: fix mode_t being used but without the proper include

in semaphore.h (used by libvpx)

(cherry picked from commit a202d1a352b4b548d2ecff88f81955a44e42728a) (rebased)

rebased: pthread has an extra patch to fix a warning in this branch

Signed-off-by: Steve Lhomme <[email protected]>

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

 contrib/src/pthreads/pthreads-fix-mode_t.patch | 13 +++++++++++++
 contrib/src/pthreads/rules.mak                 |  1 +
 2 files changed, 14 insertions(+)

diff --git a/contrib/src/pthreads/pthreads-fix-mode_t.patch 
b/contrib/src/pthreads/pthreads-fix-mode_t.patch
new file mode 100644
index 0000000000..4a5751dc9e
--- /dev/null
+++ b/contrib/src/pthreads/pthreads-fix-mode_t.patch
@@ -0,0 +1,13 @@
+--- pthreads/semaphore.h       2018-05-16 22:10:12.938777300 +0200
++++ pthreads/semaphore.h.mode_t        2018-05-16 22:08:58.453800700 +0200
+@@ -98,8 +98,10 @@
+ #  if defined(__MINGW64__)
+ #    define HAVE_STRUCT_TIMESPEC
+ #    define HAVE_MODE_T
++#    include <sys/types.h>
+ #  elif defined(_UWIN) || defined(__MINGW32__)
+ #    define HAVE_MODE_T
++#    include <sys/types.h>
+ #  endif
+ #endif
+ 
diff --git a/contrib/src/pthreads/rules.mak b/contrib/src/pthreads/rules.mak
index b5617291d3..fcc10916e4 100644
--- a/contrib/src/pthreads/rules.mak
+++ b/contrib/src/pthreads/rules.mak
@@ -23,6 +23,7 @@ endif
        $(APPLY) $(SRC)/pthreads/remove-inline.patch
        $(APPLY) $(SRC)/pthreads/x86-inline-asm.patch
        $(APPLY) $(SRC)/pthreads/arm64.patch
+       $(APPLY) $(SRC)/pthreads/pthreads-fix-mode_t.patch
        $(MOVE)
 
 PTHREADS_W32_CONF := LFLAGS="$(LDFLAGS)" PTW32_FLAGS="$(CFLAGS)"

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to