summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Jaillet <jailletc36@apache.org>2022-01-22 08:42:53 +0000
committerChristophe Jaillet <jailletc36@apache.org>2022-01-22 08:42:53 +0000
commit5c55d4c0600e7734030fa4d549913b4e94b2b0f2 (patch)
tree90057357c5f495ad209f34805da12c59138a2dc1
parent388bb3a501cb090832c8218364f7913d46c55a76 (diff)
downloadhttpd-5c55d4c0600e7734030fa4d549913b4e94b2b0f2.tar.gz
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
-rw-r--r--modules/loggers/mod_log_config.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 828e23f8b3..e515dec26e 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;