util: Follow up to r1902728 and r1902731: static/AP_THREAD_LOCAL order matters.

gcc seems to want "static __thread"  instead of "__thread static"..

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1902733 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/util.c b/server/util.c
index 63c5132f2c9f1c9984499cbc289268e81c4bf854..64a93de945668a6624ae97e341f8162d84145830 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -3287,7 +3287,7 @@ AP_DECLARE(void *) ap_realloc(void *ptr, size_t size)
 #if APR_HAS_THREADS
 
 #if AP_HAS_THREAD_LOCAL && !APR_VERSION_AT_LEAST(1,8,0)
-AP_THREAD_LOCAL static apr_thread_t *current_thread = NULL;
+static AP_THREAD_LOCAL apr_thread_t *current_thread = NULL;
 #endif
 
 struct thread_ctx {

diff --git a/server/util_pcre.c b/server/util_pcre.c
index e3ee45583751a3024bffac523c2b98305bf1afa0..21f455ca75297eac4c7a1282c5959d13464d99e4 100644 (file)
--- a/server/util_pcre.c
+++ b/server/util_pcre.c
@@ -301,7 +301,7 @@ struct match_thread_state {
     apr_pool_t *pool;
 };
 
-AP_THREAD_LOCAL static struct match_thread_state *thread_state;
+static AP_THREAD_LOCAL struct match_thread_state *thread_state;
 #endif
 
 struct match_data_state {