Contribs: compile pthread on Win64

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 69c1329073be5b5348c657090785f253637ac70a..a38c635c38633a1786e9a4000b6fec20f00bfd02 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2333,6 +2333,7 @@ pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
 pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        $(EXTRACT_GZ)
        (cd $@; patch -p0 < ../Patches/pthreads-detach.patch)
+       (patch -p0 < Patches/pthreads-win64.patch)
 
 .pthreads: pthreads
        (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a *.dll $(PREFIX)/lib/)

diff --git a/extras/contrib/src/Patches/pthreads-win64.patch b/extras/contrib/src/Patches/pthreads-win64.patch
new file mode 100644 (file)
index 0000000..5bb8354
--- /dev/null
+++ b/extras/contrib/src/Patches/pthreads-win64.patch
@@ -0,0 +1,11 @@
+--- pthreads/pthread.h 2006-01-24 14:59:57.000000000 +0100
++++ pthreads.new/pthread.h     2010-04-14 15:49:39.000000000 +0200
+@@ -302,7 +302,7 @@
+ #endif
+ #endif
+ 
+-#ifndef HAVE_STRUCT_TIMESPEC
++#if !defined( HAVE_STRUCT_TIMESPEC ) && !defined( _TIMESPEC_DEFINED )
+ #define HAVE_STRUCT_TIMESPEC 1
+ struct timespec {
+         long tv_sec;