diff options
| author | Brian Havard <bjh@apache.org> | 2010-04-02 10:10:01 +0000 |
|---|---|---|
| committer | Brian Havard <bjh@apache.org> | 2010-04-02 10:10:01 +0000 |
| commit | 4bca49e8c00a0e89a1318730c5a6da81d99f20da (patch) | |
| tree | 32521cff65afe5e982f91f35a94a2532dac10d1f /threadproc/os2 | |
| parent | 575d73fc0832c8449a34df414f16822a7292cc4d (diff) | |
| download | apr-4bca49e8c00a0e89a1318730c5a6da81d99f20da.tar.gz | |
OS/2: Remove all remaining uses of APR_OS2_STATUS macro which has been
superceded by the more general APR_FROM_OS_ERROR.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@930224 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc/os2')
| -rw-r--r-- | threadproc/os2/proc.c | 4 | ||||
| -rw-r--r-- | threadproc/os2/thread.c | 2 | ||||
| -rw-r--r-- | threadproc/os2/threadpriv.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/threadproc/os2/proc.c b/threadproc/os2/proc.c index 96f76d699..7047401b1 100644 --- a/threadproc/os2/proc.c +++ b/threadproc/os2/proc.c @@ -619,7 +619,7 @@ APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc, return APR_CHILD_NOTDONE; } - return APR_OS2_STATUS(rc); + return APR_FROM_OS_ERROR(rc); } @@ -640,7 +640,7 @@ APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc, return APR_CHILD_NOTDONE; } - return APR_OS2_STATUS(rc); + return APR_FROM_OS_ERROR(rc); } diff --git a/threadproc/os2/thread.c b/threadproc/os2/thread.c index 00ec4eb5c..a75752f77 100644 --- a/threadproc/os2/thread.c +++ b/threadproc/os2/thread.c @@ -152,7 +152,7 @@ APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, apr_thread_t *th rc = 0; /* Thread had already terminated */ *retval = thd->exitval; - return APR_OS2_STATUS(rc); + return APR_FROM_OS_ERROR(rc); } diff --git a/threadproc/os2/threadpriv.c b/threadproc/os2/threadpriv.c index 107ec10d7..c0f709c31 100644 --- a/threadproc/os2/threadpriv.c +++ b/threadproc/os2/threadpriv.c @@ -33,7 +33,7 @@ APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key, } (*key)->pool = pool; - return APR_OS2_STATUS(DosAllocThreadLocalMemory(1, &((*key)->key))); + return APR_FROM_OS_ERROR(DosAllocThreadLocalMemory(1, &((*key)->key))); } APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new, apr_threadkey_t *key) @@ -50,7 +50,7 @@ APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv, apr_threadkey_t APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key) { - return APR_OS2_STATUS(DosFreeThreadLocalMemory(key->key)); + return APR_FROM_OS_ERROR(DosFreeThreadLocalMemory(key->key)); } APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key, |