summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68>2004-11-29 15:38:06 +0000
committerbnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68>2004-11-29 15:38:06 +0000
commit9a133003a2b1839c93dab5301051593579cbe1cb (patch)
tree41c464bb21bf8dc4a8ba988a1913f629ebae4ec5
parentf0b59261d2877f62b558df7fb5c917f46e71d828 (diff)
downloadlibapr-9a133003a2b1839c93dab5301051593579cbe1cb.tar.gz
Fixing various compiler errors when compiling against the latest version of LibC SDK
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@106919 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--locks/netware/thread_mutex.c2
-rw-r--r--threadproc/netware/proc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/locks/netware/thread_mutex.c b/locks/netware/thread_mutex.c
index 403e34285..b4f9c66a8 100644
--- a/locks/netware/thread_mutex.c
+++ b/locks/netware/thread_mutex.c
@@ -46,7 +46,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex,
}
new_mutex->pool = pool;
- new_mutex->mutex = NXMutexAlloc(NX_MUTEX_RECURSIVE, NULL, NULL);
+ new_mutex->mutex = NXMutexAlloc(NX_MUTEX_RECURSIVE, 0, NULL);
if(new_mutex->mutex == NULL)
return APR_ENOMEM;
diff --git a/threadproc/netware/proc.c b/threadproc/netware/proc.c
index dce5758f7..2956017e8 100644
--- a/threadproc/netware/proc.c
+++ b/threadproc/netware/proc.c
@@ -385,7 +385,7 @@ APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
}
else if (WIFSIGNALED(exit_int)) {
*exitwhy = APR_PROC_SIGNAL;
- *exitcode = WTERMSIG(exit_int);
+ *exitcode = WIFTERMSIG(exit_int);
}
else {
/* unexpected condition */