diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-12 04:59:59 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-12 04:59:59 +0000 |
commit | 052282b2d174632c62327a1ccd2d839e8ab3ec9e (patch) | |
tree | 9604f20f0dc601f1b8f34d0adbd9fcdc57140b2d /threadproc | |
parent | Releasing progress-linux version 1.7.2-3.2~progress7.99u1. (diff) | |
download | apr-052282b2d174632c62327a1ccd2d839e8ab3ec9e.tar.xz apr-052282b2d174632c62327a1ccd2d839e8ab3ec9e.zip |
Merging upstream version 1.7.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | threadproc/os2/thread.c | 2 | ||||
-rw-r--r-- | threadproc/win32/thread.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/threadproc/os2/thread.c b/threadproc/os2/thread.c index 00ec4eb..55d334e 100644 --- a/threadproc/os2/thread.c +++ b/threadproc/os2/thread.c @@ -119,7 +119,7 @@ APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new, apr_threadattr_t -APR_DECLARE(apr_os_thread_t) apr_os_thread_current() +APR_DECLARE(apr_os_thread_t) apr_os_thread_current(void) { PIB *ppib; TIB *ptib; diff --git a/threadproc/win32/thread.c b/threadproc/win32/thread.c index 2503457..1844335 100644 --- a/threadproc/win32/thread.c +++ b/threadproc/win32/thread.c @@ -179,7 +179,7 @@ APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd) } } -APR_DECLARE(void) apr_thread_yield() +APR_DECLARE(void) apr_thread_yield(void) { /* SwitchToThread is not supported on Win9x, but since it's * primarily a noop (entering time consuming code, therefore |