20 lines
874 B
Diff
20 lines
874 B
Diff
diff -up ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h.ppc ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h
|
|
--- ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h.ppc 2010-11-03 14:24:47.000000000 -0400
|
|
+++ ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h 2010-12-20 14:44:49.467800002 -0500
|
|
@@ -1838,6 +1838,7 @@ static MLOCK_T malloc_global_mutex = PTH
|
|
|
|
/* Cope with old-style linux recursive lock initialization by adding */
|
|
/* skipped internal declaration from pthread.h */
|
|
+/*
|
|
#ifdef linux
|
|
#if !defined (PTHREAD_MUTEX_RECURSIVE) && defined (PTHREAD_MUTEX_RECURSIVE_NP)
|
|
extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr,
|
|
@@ -1846,6 +1847,7 @@ extern int pthread_mutexattr_setkind_np
|
|
#define pthread_mutexattr_settype(x,y) pthread_mutexattr_setkind_np(x,y)
|
|
#endif
|
|
#endif
|
|
+*/
|
|
|
|
static int pthread_init_lock (MLOCK_T *sl) {
|
|
pthread_mutexattr_t attr;
|