Basic NetWare changes

diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index 65447c6df059fba73be3696a4393bdf0412c98dd..6af686b0356c91fc1ecf80b9f44ec66e078e1973 100644 (file)
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -412,6 +412,8 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 {
 #ifdef TSRM_WIN32
        return GetCurrentThreadId();
+#elif defined(NETWARE)
+       return NXThreadGetId();
 #elif defined(GNUPTH)
        return pth_self();
 #elif defined(PTHREADS)
@@ -430,10 +432,17 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 {
     MUTEX_T mutexp;
+#ifdef NETWARE
+    long flags = 0;  /* Don't require NX_MUTEX_RECURSIVE, I guess */
+    NXHierarchy_t order = 0;
+    NX_LOCK_INFO_ALLOC (lockInfo, "PHP-TSRM", 0);
+#endif    
 
 #ifdef TSRM_WIN32
     mutexp = malloc(sizeof(CRITICAL_SECTION));
        InitializeCriticalSection(mutexp);
+#elif defined(NETWARE)
+    mutexp = NXMutexAlloc(flags, order, &lockInfo); /* return value ignored for now */
 #elif defined(GNUPTH)
        mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
        pth_mutex_init(mutexp);
@@ -460,6 +469,8 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
     if (mutexp) {
 #ifdef TSRM_WIN32
                DeleteCriticalSection(mutexp);
+#elif defined(NETWARE)
+               NXMutexFree(mutexp);
 #elif defined(GNUPTH)
                free(mutexp);
 #elif defined(PTHREADS)
@@ -486,6 +497,8 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
        EnterCriticalSection(mutexp);
        return 1;
+#elif defined(NETWARE)
+       return NXLock(mutexp);  
 #elif defined(GNUPTH)
        return pth_mutex_acquire(mutexp, 0, NULL);
 #elif defined(PTHREADS)
@@ -507,6 +520,8 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
        LeaveCriticalSection(mutexp);
        return 1;
+#elif defined(NETWARE)
+       return NXUnlock(mutexp);
 #elif defined(GNUPTH)
        return pth_mutex_release(mutexp);
 #elif defined(PTHREADS)

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index eed6986a6a811fc219b158ab06647adde40c678c..6d6ee562426d1d4a41abb56535fc59cc963013b6 100644 (file)
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -36,6 +36,9 @@
 
 #ifdef TSRM_WIN32
 # include <windows.h>
+#elif defined(NETWARE)
+# include <nks/thread.h>
+# include <nks/synch.h>
 #elif defined(GNUPTH)
 # include <pth.h>
 #elif defined(PTHREADS)
@@ -50,6 +53,9 @@ typedef int ts_rsrc_id;
 #ifdef TSRM_WIN32
 # define THREAD_T DWORD
 # define MUTEX_T CRITICAL_SECTION *
+#elif defined(NETWARE)
+# define THREAD_T NXThreadId_t
+# define MUTEX_T NXMutex_t *
 #elif defined(GNUPTH)
 # define THREAD_T pth_t
 # define MUTEX_T pth_mutex_t *