Test for AP_USE_HSREGEX, not USE_HSREGEX, as that's what actually gets

defined (in ap_config_auto.h) when using the bundled hsregex.

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

diff --git a/include/ap_config.h b/include/ap_config.h
index cd356e216855e11ff41550afb81a52d6ec00cc25..ecec55f50441b9576e43cb95ecd5d8147d9b4be0 100644 (file)
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -1089,7 +1089,7 @@ typedef int rlim_t;
 
 #ifdef WIN32
 #include "../include/hsregex.h"
-#elif defined(USE_HSREGEX)
+#elif defined(AP_USE_HSREGEX)
 #include "hsregex.h"
 #else
 #include <regex.h>

diff --git a/include/httpd.h b/include/httpd.h
index 614517684b1a66a9743b74d4515291815b6fa1e1..a34490cf6b66803ff82feed2528cb8bce43449cc 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -942,7 +942,7 @@ API_EXPORT(char *) ap_uudecode(ap_context_t *p, const char *bufcoded);
 API_EXPORT(char *) ap_uuencode(ap_context_t *p, char *string); 
 
 /* Regexes */
-#if defined(USE_HSREGEX) || defined(WIN32)
+#if defined(AP_USE_HSREGEX) || defined(WIN32)
 #include "hsregex.h"
 #else
 #include <regex.h>