diff options
Diffstat (limited to 'threadproc')
| -rw-r--r-- | threadproc/beos/thread.c | 4 | ||||
| -rw-r--r-- | threadproc/netware/thread.c | 4 | ||||
| -rw-r--r-- | threadproc/os2/thread.c | 3 | ||||
| -rw-r--r-- | threadproc/unix/thread.c | 5 | ||||
| -rw-r--r-- | threadproc/win32/thread.c | 4 |
5 files changed, 6 insertions, 14 deletions
diff --git a/threadproc/beos/thread.c b/threadproc/beos/thread.c index 01bc7a973..c372f135e 100644 --- a/threadproc/beos/thread.c +++ b/threadproc/beos/thread.c @@ -124,13 +124,11 @@ int apr_os_thread_equal(apr_os_thread_t tid1, apr_os_thread_t tid2) return tid1 == tid2; } -APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd, apr_status_t retval) +APR_DECLARE(void) apr_thread_exit(apr_thread_t *thd, apr_status_t retval) { apr_pool_destroy(thd->pool); thd->exitval = retval; exit_thread ((status_t)(retval)); - /* This will never be reached... */ - return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, apr_thread_t *thd) diff --git a/threadproc/netware/thread.c b/threadproc/netware/thread.c index a37b107a0..bf0396395 100644 --- a/threadproc/netware/thread.c +++ b/threadproc/netware/thread.c @@ -159,13 +159,11 @@ void apr_thread_yield() NXThreadYield(); } -apr_status_t apr_thread_exit(apr_thread_t *thd, - apr_status_t retval) +void apr_thread_exit(apr_thread_t *thd, apr_status_t retval) { thd->exitval = retval; apr_pool_destroy(thd->pool); NXThreadExit(NULL); - return APR_SUCCESS; } apr_status_t apr_thread_join(apr_status_t *retval, diff --git a/threadproc/os2/thread.c b/threadproc/os2/thread.c index 9911034ae..8781f932a 100644 --- a/threadproc/os2/thread.c +++ b/threadproc/os2/thread.c @@ -131,12 +131,11 @@ APR_DECLARE(apr_os_thread_t) apr_os_thread_current() -APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd, apr_status_t retval) +APR_DECLARE(void) apr_thread_exit(apr_thread_t *thd, apr_status_t retval) { thd->exitval = retval; apr_pool_destroy(thd->pool); _endthread(); - return -1; /* If we get here something's wrong */ } diff --git a/threadproc/unix/thread.c b/threadproc/unix/thread.c index dcef500e9..f76e6ce44 100644 --- a/threadproc/unix/thread.c +++ b/threadproc/unix/thread.c @@ -204,13 +204,12 @@ APR_DECLARE(int) apr_os_thread_equal(apr_os_thread_t tid1, return pthread_equal(tid1, tid2); } -APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd, - apr_status_t retval) +APR_DECLARE(void) apr_thread_exit(apr_thread_t *thd, + apr_status_t retval) { thd->exitval = retval; apr_pool_destroy(thd->pool); pthread_exit(NULL); - return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, diff --git a/threadproc/win32/thread.c b/threadproc/win32/thread.c index 3204a1c2c..aa045df39 100644 --- a/threadproc/win32/thread.c +++ b/threadproc/win32/thread.c @@ -134,8 +134,7 @@ APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new, return APR_SUCCESS; } -APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd, - apr_status_t retval) +APR_DECLARE(void) apr_thread_exit(apr_thread_t *thd, apr_status_t retval) { thd->exitval = retval; apr_pool_destroy(thd->pool); @@ -145,7 +144,6 @@ APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd, #else ExitThread(0); #endif - return APR_SUCCESS; } APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, |