From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 22 Jan 2022 08:42:53 +0000 (+0000)
Subject: APR 1.3 is a requirement for building httpd 2.4 and above.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~559
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=5c55d4c0600e7734030fa4d549913b4e94b2b0f2;p=thirdparty%2Fapache%2Fhttpd.git

APR 1.3 is a requirement for building httpd 2.4 and above.

So this compatibility test can be removed.

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

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 828e23f8b35..e515dec26ef 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -882,14 +882,8 @@ static const char *log_pid_tid(request_rec *r, char *a)
         int tid = 0; /* APR will format "0" anyway but an arg is needed */
 #endif
         return apr_psprintf(r->pool,
-#if APR_MAJOR_VERSION > 1 || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 2)
                             /* APR can format a thread id in hex */
-                            *a == 'h' ? "%pt" : "%pT",
-#else
-                            /* APR is missing the feature, so always use decimal */
-                            "%pT",
-#endif
-                            &tid);
+                            *a == 'h' ? "%pt" : "%pT", &tid);
     }
     /* bogus format */
     return a;