From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 20 Jan 2022 11:24:59 +0000 (+0000)
Subject: Follow up to r1897240: APR_HAS_THREAD_LOCAL wants #ifdef instead of #if.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~578
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3941e5eb6877d467ec1bfa08026ac92a3135327;p=thirdparty%2Fapache%2Fhttpd.git

Follow up to r1897240: APR_HAS_THREAD_LOCAL wants #ifdef instead of #if.



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

diff --git a/server/main.c b/server/main.c
index 0e010bb2a88..8a1d5273d92 100644
--- a/server/main.c
+++ b/server/main.c
@@ -338,7 +338,7 @@ static void reset_process_pconf(process_rec *process)
     apr_pool_pre_cleanup_register(process->pconf, NULL, deregister_all_hooks);
 }
 
-#if APR_HAS_THREAD_LOCAL
+#ifdef APR_HAS_THREAD_LOCAL
 static apr_status_t main_thread_exit_cleanup(void *arg)
 {
     apr_thread_t *thd = arg;
@@ -398,7 +398,7 @@ static process_rec *init_process(int *argc, const char * const * *argv)
     process->argv = *argv;
     process->short_name = apr_filepath_name_get((*argv)[0]);
 
-#if APR_HAS_THREAD_LOCAL
+#ifdef APR_HAS_THREAD_LOCAL
     /* Create an apr_thread_t for the main thread to set up its
      * Thread Local Storage. Since it's detached and it won't
      * apr_thread_exit(), destroy its pool before exiting via
diff --git a/server/util_pcre.c b/server/util_pcre.c
index fd987771fcb..1dcd9507929 100644
--- a/server/util_pcre.c
+++ b/server/util_pcre.c
@@ -282,7 +282,7 @@ typedef int*              match_data_pt;
 typedef int*              match_vector_pt;
 #endif
 
-#if APR_HAS_THREAD_LOCAL
+#ifdef APR_HAS_THREAD_LOCAL
 
 static match_data_pt get_match_data(apr_size_t size,
                                     match_vector_pt *ovector,
@@ -398,7 +398,7 @@ AP_DECLARE(int) ap_regexec_len(const ap_regex_t *preg, const char *buff,
     match_vector_pt ovector = NULL;
     apr_size_t nlim = ((apr_size_t)preg->re_nsub + 1) > nmatch
                     ? ((apr_size_t)preg->re_nsub + 1) : nmatch;
-#if defined(HAVE_PCRE2) || APR_HAS_THREAD_LOCAL
+#if defined(HAVE_PCRE2) || defined(APR_HAS_THREAD_LOCAL)
     match_data_pt data = get_match_data(nlim, &ovector, NULL);
 #else
     int small_vector[POSIX_MALLOC_THRESHOLD * 3];