diff options
| author | Yann Ylavic <ylavic@apache.org> | 2023-03-15 16:29:41 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2023-03-15 16:29:41 +0000 |
| commit | e33e9a295910798e98fe787a6e32e9eb2da50679 (patch) | |
| tree | dbd3dd3416c70aed67aae9792b98d19d1914855b | |
| parent | af9307772b592ee351034dff5eca107e10f2397f (diff) | |
| download | apr-e33e9a295910798e98fe787a6e32e9eb2da50679.tar.gz | |
apr_thread: Follow up to r1897207: apr_thread_current_create() is ENOTIMPL w/o APR_HAS_THREAD_LOCAL.
It's useless when !APR_HAS_THREAD_LOCAL since apr_thread_current() can't work.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1908417 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | threadproc/beos/thread.c | 6 | ||||
| -rw-r--r-- | threadproc/netware/thread.c | 6 | ||||
| -rw-r--r-- | threadproc/os2/thread.c | 6 | ||||
| -rw-r--r-- | threadproc/unix/thread.c | 6 | ||||
| -rw-r--r-- | threadproc/win32/thread.c | 6 |
5 files changed, 20 insertions, 10 deletions
diff --git a/threadproc/beos/thread.c b/threadproc/beos/thread.c index bf297330f..10fe03a97 100644 --- a/threadproc/beos/thread.c +++ b/threadproc/beos/thread.c @@ -166,6 +166,7 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, apr_threadattr_t *attr, apr_pool_t *pool) { +#if APR_HAS_THREAD_LOCAL apr_status_t stat; *current = apr_thread_current(); @@ -181,10 +182,11 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, (*current)->td = apr_os_thread_current(); -#if APR_HAS_THREAD_LOCAL current_thread = *current; -#endif return APR_SUCCESS; +#else + return APR_ENOTIMPL; +#endif } APR_DECLARE(void) apr_thread_current_after_fork(void) diff --git a/threadproc/netware/thread.c b/threadproc/netware/thread.c index 822d2e24f..3ee9514fb 100644 --- a/threadproc/netware/thread.c +++ b/threadproc/netware/thread.c @@ -201,6 +201,7 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, apr_threadattr_t *attr, apr_pool_t *pool) { +#if APR_HAS_THREAD_LOCAL apr_status_t stat; *current = apr_thread_current(); @@ -216,10 +217,11 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, (*current)->td = apr_os_thread_current(); -#if APR_HAS_THREAD_LOCAL current_thread = *current; -#endif return APR_SUCCESS; +#else + return APR_ENOTIMPL; +#endif } APR_DECLARE(void) apr_thread_current_after_fork(void) diff --git a/threadproc/os2/thread.c b/threadproc/os2/thread.c index 1ea7954dc..ca3164441 100644 --- a/threadproc/os2/thread.c +++ b/threadproc/os2/thread.c @@ -169,6 +169,7 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, apr_threadattr_t *attr, apr_pool_t *pool) { +#if APR_HAS_THREAD_LOCAL apr_status_t stat; *current = apr_thread_current(); @@ -184,10 +185,11 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, (*current)->tid = apr_os_thread_current(); -#if APR_HAS_THREAD_LOCAL current_thread = *current; -#endif return APR_SUCCESS; +#else + return APR_ENOTIMPL; +#endif } APR_DECLARE(void) apr_thread_current_after_fork(void) diff --git a/threadproc/unix/thread.c b/threadproc/unix/thread.c index 70a7c5d30..ccc34c4d2 100644 --- a/threadproc/unix/thread.c +++ b/threadproc/unix/thread.c @@ -247,6 +247,7 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, apr_threadattr_t *attr, apr_pool_t *pool) { +#if APR_HAS_THREAD_LOCAL apr_status_t stat; *current = apr_thread_current(); @@ -262,10 +263,11 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, *(*current)->td = apr_os_thread_current(); -#if APR_HAS_THREAD_LOCAL current_thread = *current; -#endif return APR_SUCCESS; +#else + return APR_ENOTIMPL; +#endif } APR_DECLARE(void) apr_thread_current_after_fork(void) diff --git a/threadproc/win32/thread.c b/threadproc/win32/thread.c index 502c317a8..2929d4cbb 100644 --- a/threadproc/win32/thread.c +++ b/threadproc/win32/thread.c @@ -182,6 +182,7 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, apr_threadattr_t *attr, apr_pool_t *pool) { +#if APR_HAS_THREAD_LOCAL apr_status_t stat; *current = apr_thread_current(); @@ -199,10 +200,11 @@ APR_DECLARE(apr_status_t) apr_thread_current_create(apr_thread_t **current, (*current)->td = apr_os_thread_current(); } -#if APR_HAS_THREAD_LOCAL current_thread = *current; -#endif return APR_SUCCESS; +#else + return APR_ENOTIMPL; +#endif } APR_DECLARE(void) apr_thread_current_after_fork(void) |