From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 15 Jul 2022 11:49:30 +0000 (+0000)
Subject: util: Follow up to r1902728 and r1902731: static/AP_THREAD_LOCAL order matters.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~259
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c89c1bf3949be5aed13d58e10261c402693cbb0c;p=thirdparty%2Fapache%2Fhttpd.git

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 63c5132f2c9..64a93de9456 100644
--- 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 e3ee4558375..21f455ca752 100644
--- 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 {