diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 16:55:11 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 16:55:11 +0000 |
| commit | fc44f8a893521c0f8eb43af8f5783e69ebfe19b1 (patch) | |
| tree | 56dd448c11f77c53a545e0027a8c7ed8814351ec /threadproc | |
| parent | 1760f5378838f561bf8f382293714c9760efb183 (diff) | |
| download | libapr-fc44f8a893521c0f8eb43af8f5783e69ebfe19b1.tar.gz | |
merge trunk revs 1083169, 1083177, 1083178, 1083183, and 1083227
to resolve some gcc warnings and dead code on Windows
(the testlfsabi change from r1083183 is omitted, as the testcases
aren't in this branch)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1083869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc')
| -rw-r--r-- | threadproc/win32/signals.c | 3 | ||||
| -rw-r--r-- | threadproc/win32/threadpriv.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/threadproc/win32/signals.c b/threadproc/win32/signals.c index b97023094..f19fb0324 100644 --- a/threadproc/win32/signals.c +++ b/threadproc/win32/signals.c @@ -17,6 +17,7 @@ #include "apr_arch_threadproc.h" #include "apr_arch_file_io.h" #include "apr_thread_proc.h" +#include "apr_signal.h" #include "apr_file_io.h" #include "apr_general.h" #if APR_HAVE_SIGNAL_H @@ -50,7 +51,7 @@ void apr_signal_init(apr_pool_t *pglobal) { } -const char *apr_signal_description_get(int signum) +APR_DECLARE(const char *) apr_signal_description_get(int signum) { return "unknown signal (not supported)"; } diff --git a/threadproc/win32/threadpriv.c b/threadproc/win32/threadpriv.c index 0cbfe620e..787c142c4 100644 --- a/threadproc/win32/threadpriv.c +++ b/threadproc/win32/threadpriv.c @@ -41,7 +41,7 @@ APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key, APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new, apr_threadkey_t *key) { - if ((*new) = TlsGetValue(key->key)) { + if (((*new) = TlsGetValue(key->key))) { return APR_SUCCESS; } return apr_get_os_error(); |