[vlc-commits] commit: Contribs: compile pthread on Win64 (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Apr 14 15:57:44 2010 +0200| [6e2922444cfd0bfa4eca22ce69ae802942052bbe] | committer: Jean-Baptiste Kempf 

Contribs: compile pthread on Win64

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

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

 extras/contrib/src/Makefile                     |    1 +
 extras/contrib/src/Patches/pthreads-win64.patch |   11 +++++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 69c1329..a38c635 100644
--- 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
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;