From: Anantha Kesari H Y <hyanantha@php.net>
Date: Fri, 11 Mar 2005 11:13:03 +0000 (+0000)
Subject: NetWare has a proper pthreads support
X-Git-Tag: php-5.0.4RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a012d5a5dcb33459194d37186c04d676052a6d6b;p=php

NetWare has a proper pthreads support
---

diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index 8dd1c98e45..2fbf796ef6 100644
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -481,13 +481,6 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 {
 #ifdef TSRM_WIN32
 	return GetCurrentThreadId();
-#elif defined(NETWARE)
-	/* There seems to be some problem with the LibC call: NXThreadGetId().
-	 * Due to this, the PHPMyAdmin application is abending in PHP calls.
-	 * Used the call, kCurrentThread instead and it works fine.
-	 */
-/*	return NXThreadGetId(); */
-	return kCurrentThread();
 #elif defined(GNUPTH)
 	return pth_self();
 #elif defined(PTHREADS)
@@ -508,24 +501,9 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 {
 	MUTEX_T mutexp;
-#ifdef NETWARE
-#ifndef USE_MPK
-	/* To use the Recursive Mutex Locking of LibC */
-	long flags = NX_MUTEX_RECURSIVE;
-	NXHierarchy_t order = 0;
-	NX_LOCK_INFO_ALLOC (lockInfo, "PHP-TSRM", 0);
-#endif
-#endif
-
 #ifdef TSRM_WIN32
 	mutexp = malloc(sizeof(CRITICAL_SECTION));
 	InitializeCriticalSection(mutexp);
-#elif defined(NETWARE)
-#ifdef USE_MPK
-	mutexp = kMutexAlloc((BYTE*)"PHP-TSRM");
-#else
-	mutexp = NXMutexAlloc(flags, order, &lockInfo);
-#endif
 #elif defined(GNUPTH)
 	mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
 	pth_mutex_init(mutexp);