(trafficserver) branch master updated: Changed traffic_layout to report the version of PCRE2 (#12354)

[bcall]

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 5b03698684 Changed traffic_layout to report the version of PCRE2 
(#12354)
5b03698684 is described below

commit 5b03698684a3abcf81027afc948598ad8f9e9bad
Author: Bryan Call <bc...@apache.org>
AuthorDate: Mon Jul 14 14:58:20 2025 -0700

    Changed traffic_layout to report the version of PCRE2 (#12354)
---
 src/traffic_layout/info.cc | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/traffic_layout/info.cc b/src/traffic_layout/info.cc
index 33de584eff..62732e0947 100644
--- a/src/traffic_layout/info.cc
+++ b/src/traffic_layout/info.cc
@@ -32,13 +32,8 @@
 #include "info.h"
 #include "iocore/eventsystem/RecProcess.h"
 
-#if __has_include("pcre/pcre.h")
-#include <pcre/pcre.h>
-#elif __has_include("pcre.h")
-#include <pcre.h>
-#else
-#error "Unable to locate PCRE heeader"
-#endif
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
 
 #if TS_USE_HWLOC
 #include <hwloc.h>
@@ -189,7 +184,7 @@ produce_versions(bool json)
   print_var("libz", LBW().print("{}", ZLIB_VERSION).view(), json);
   print_var("openssl", LBW().print("{:#x}", OPENSSL_VERSION_NUMBER).view(), 
json);
   print_var("openssl_str", LBW().print(OPENSSL_VERSION_TEXT).view(), json);
-  print_var("pcre", LBW().print("{}.{}", PCRE_MAJOR, PCRE_MINOR).view(), json);
+  print_var("pcre2", LBW().print("{}.{}", PCRE2_MAJOR, PCRE2_MINOR).view(), 
json);
   // These are optional, for now at least.
 #if TS_USE_HWLOC
   print_var("hwloc", LBW().print("{:#x}", HWLOC_API_VERSION).view(), json);