summaryrefslogtreecommitdiffstats
path: root/main/libxml2/libxml2-pthread.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/libxml2/libxml2-pthread.patch')
-rw-r--r--main/libxml2/libxml2-pthread.patch56
1 files changed, 7 insertions, 49 deletions
diff --git a/main/libxml2/libxml2-pthread.patch b/main/libxml2/libxml2-pthread.patch
index d6e6f466a..77d7b3849 100644
--- a/main/libxml2/libxml2-pthread.patch
+++ b/main/libxml2/libxml2-pthread.patch
@@ -1,53 +1,11 @@
---- libxml2-2.9.1.patched/threads.c 2013-07-24 03:30:55.160000003 +0000
-+++ libxml2-2.9.1/threads.c 2013-07-24 03:33:50.323000003 +0000
-@@ -47,49 +47,7 @@
+--- libxml2-2.9.1/threads.c.orig
++++ libxml2-2.9.1/threads.c
+@@ -47,7 +47,7 @@
#ifdef HAVE_PTHREAD_H
static int libxml_is_threaded = -1;
-#ifdef __GNUC__
--#ifdef linux
--#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3)
--extern int pthread_once (pthread_once_t *__once_control,
-- void (*__init_routine) (void))
-- __attribute((weak));
--extern void *pthread_getspecific (pthread_key_t __key)
-- __attribute((weak));
--extern int pthread_setspecific (pthread_key_t __key,
-- __const void *__pointer)
-- __attribute((weak));
--extern int pthread_key_create (pthread_key_t *__key,
-- void (*__destr_function) (void *))
-- __attribute((weak));
--extern int pthread_key_delete (pthread_key_t __key)
-- __attribute((weak));
--extern int pthread_mutex_init ()
-- __attribute((weak));
--extern int pthread_mutex_destroy ()
-- __attribute((weak));
--extern int pthread_mutex_lock ()
-- __attribute((weak));
--extern int pthread_mutex_unlock ()
-- __attribute((weak));
--extern int pthread_cond_init ()
-- __attribute((weak));
--extern int pthread_cond_destroy ()
-- __attribute((weak));
--extern int pthread_cond_wait ()
-- __attribute((weak));
--extern int pthread_equal ()
-- __attribute((weak));
--extern pthread_t pthread_self ()
-- __attribute((weak));
--extern int pthread_key_create ()
-- __attribute((weak));
--extern int pthread_key_delete ()
-- __attribute((weak));
--extern int pthread_cond_signal ()
-- __attribute((weak));
--#endif
--#endif /* linux */
--#endif /* __GNUC__ */
-+
- #endif /* HAVE_PTHREAD_H */
-
- /*
++#if defined(__GNUC__) && defined(__GLIBC__)
+ #ifdef linux
+ #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3)
+ extern int pthread_once (pthread_once_t *__once_control,