* include/http_config.h

  (ap_get_module_config, ap_set_module_config): Always declare.

* include/httpd.h

  (ap_strchr, ap_strchr_c, ap_strrchr, ap_strrchr_c, ap_strstr, ap_strstr_c):
    Always declare.

* server/util_debug.c

  (ap_get_module_config, ap_set_module_config, ap_strchr, ap_strchr_c,
   ap_strrchr, ap_strrchr_c, ap_strstr, ap_strstr_c):
    Always implement and export.

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

diff --git a/include/http_config.h b/include/http_config.h
index 3c85429e4a6df5fd2c4e5ea83fd38cffbabb2bdd..96221f928dfec3d13f4b28d171b4cc788ef2c5b8 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -459,7 +459,6 @@ struct module_struct {
 /** configuration vector structure */
 typedef struct ap_conf_vector_t ap_conf_vector_t;
 
-#if defined(AP_DEBUG) || defined(DOXYGEN)
 /**
  * Generic accessors for other modules to get at their own module-specific
  * data
@@ -482,7 +481,7 @@ AP_DECLARE(void *) ap_get_module_config(const ap_conf_vector_t *cv,
 AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
                                       void *val);
 
-#else /* AP_DEBUG */
+#if defined(AP_DEBUG)
 
 #define ap_get_module_config(v,m)      \
     (((void **)(v))[(m)->module_index])

diff --git a/include/httpd.h b/include/httpd.h
index 06e8de65be9ffd9204697d0f759482796ba47471..b922506ca478b29d2a08abf2ca322c028c848f76 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1697,6 +1697,13 @@ AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r);
   */
 #include <string.h>
 
+AP_DECLARE(char *) ap_strchr(char *s, int c);
+AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
+AP_DECLARE(char *) ap_strrchr(char *s, int c);
+AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
+AP_DECLARE(char *) ap_strstr(char *s, const char *c);
+AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
+
 #ifdef AP_DEBUG
 
 #undef strchr
@@ -1706,13 +1713,6 @@ AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r);
 #undef strstr
 # define strstr(s, c)  ap_strstr(s,c)
 
-AP_DECLARE(char *) ap_strchr(char *s, int c);
-AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
-AP_DECLARE(char *) ap_strrchr(char *s, int c);
-AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
-AP_DECLARE(char *) ap_strstr(char *s, const char *c);
-AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
-
 #else
 
 /** use this instead of strchr */

diff --git a/server/util_debug.c b/server/util_debug.c
index 2fba33702cfe5abbfd91b73a37a16269091d1179..e135d54c1df0f7cd0c2cf814f87f41b7440012dd 100644 (file)
--- a/server/util_debug.c
+++ b/server/util_debug.c
@@ -62,38 +62,85 @@
 #include "httpd.h"
 #include "http_config.h"
 
-#ifdef AP_DEBUG
-
-/* get rid of the macros we defined in httpd.h */
+/* Possibly get rid of the macros we defined in httpd.h */
+#if defined(strchr)
 #undef strchr
+#endif
+
+#if defined (strrchr)
 #undef strrchr
+#endif
+
+#if defined (strstr)
 #undef strstr
+#endif
+
+
+#if defined(ap_strchr)
+#undef ap_strchr
+AP_DECLARE(char *) ap_strchr(char *s, int c);
+#endif
 
 AP_DECLARE(char *) ap_strchr(char *s, int c)
 {
     return strchr(s,c);
 }
+
+#if defined(ap_strchr_c)
+#undef ap_strchr_c
+AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
+#endif
+
 AP_DECLARE(const char *) ap_strchr_c(const char *s, int c)
 {
     return strchr(s,c);
 }
+
+#if defined(ap_strrchr)
+#undef ap_strrchr
+AP_DECLARE(char *) ap_strrchr(char *s, int c);
+#endif
+
 AP_DECLARE(char *) ap_strrchr(char *s, int c)
 {
     return strrchr(s,c);
 }
+
+#if defined(ap_strrchr_c)
+#undef ap_strrchr_c
+AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
+#endif
+
 AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c)
 {
     return strrchr(s,c);
 }
+
+#if defined(ap_strstr)
+#undef ap_strstr
+AP_DECLARE(char *) ap_strstr(char *s, const char *c);
+#endif
+
 AP_DECLARE(char *) ap_strstr(char *s, const char *c)
 {
     return strstr(s,c);
 }
+
+#if defined(ap_strstr_c)
+#undef ap_strstr_c
+AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
+#endif
+
 AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c)
 {
     return strstr(s,c);
 }
 
+#if defined(ap_get_module_config)
+#undef ap_get_module_config
+AP_DECLARE(void *) ap_get_module_config(const ap_conf_vector_t *cv,
+                                        const module *m);
+#endif
 
 AP_DECLARE(void *) ap_get_module_config(const ap_conf_vector_t *cv,
                                         const module *m)
@@ -110,11 +157,14 @@ AP_DECLARE(void *) ap_get_module_config(const ap_conf_vector_t *cv,
  * @param val The module-specific data to set
  * @deffunc void ap_set_module_config(ap_conf_vector_t *cv, const module *m, void *val)
  */
+#if defined(ap_set_module_config)
+#undef ap_set_module_config
+AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
+                                      void *val);
+#endif
+
 AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
                                       void *val)
 {
     ((void **)cv)[m->module_index] = val;
 }
-
-
-#endif /* AP_DEBUG */