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

[Pierre Ynard]

vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Sun May  8 18:38:39 2011 +0200| [27e40c3736f1e1de6a233729e6a489e98abbb92b] | committer: Pierre Ynard

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

It breaks the build of pthread.

This reverts commit f8db78d5ab27a41e02dbfb3f01e26023c1345246.

Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>

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

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

diff --git a/extras/contrib/src/Patches/pthread-config-h.patch b/extras/contrib/src/Patches/pthread-config-h.patch
deleted file mode 100644
index b8d8ec2..0000000
--- a/extras/contrib/src/Patches/pthread-config-h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 2c68ac5..8a96f69 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -2297,7 +2297,6 @@ 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)