[vlc-commits] Contribs: don't allow pthread to use config.h

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun May  8 13:04:04 2011 +0200| [f8db78d5ab27a41e02dbfb3f01e26023c1345246] | committer: Jean-Baptiste Kempf

Contribs: don't allow pthread to use config.h

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

 extras/contrib/src/Patches/pthread-config-h.patch |   13 +++++++++++++
 extras/contrib/src/contrib-src.mak                |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Patches/pthread-config-h.patch b/extras/contrib/src/Patches/pthread-config-h.patch
new file mode 100644
index 0000000..b8d8ec2
--- /dev/null
+++ b/extras/contrib/src/Patches/pthread-config-h.patch
@@ -0,0 +1,13 @@
+--- pthreads/pthread.h	2006-01-24 14:59:57.000000000 +0100
++++ pthreads.old/pthread.h	2011-05-08 13:00:21.382759343 +0200
+@@ -210,10 +210,6 @@
+  * -----------------
+  */
+ 
+-#if HAVE_CONFIG_H
+-#include "config.h"
+-#endif /* HAVE_CONFIG_H */
+-
+ #ifndef NEED_FTIME
+ #include <time.h>
+ #else /* NEED_FTIME */
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 8a96f69..2c68ac5 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2297,6 +2297,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/pthread-config-h.patch
 	sed -i 's/^CROSS.*=/CROSS ?=/' $@/GNUmakefile
 ifdef HAVE_WIN64
 	(patch -p0 < Patches/pthreads-win64.patch)