Use AP_DECLARE in the debug versions of ap_strXXX in case the

default calling convention is not the same as the one used by
AP_DECLARE.

Submitted by:	  Juan Rivera <Juan.Rivera@citrix.com>
Reviewed by:	  Jeff Trawick

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

diff --git a/CHANGES b/CHANGES
index 22163b577238f3cc03d6be5eca2085aa14af8995..1805dca7a90675212480f8fcbf6a30dab6e0537f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.44
 
+  *) Use AP_DECLARE in the debug versions of ap_strXXX in case the
+     default calling convention is not the same as the one used by
+     AP_DECLARE.  [Juan Rivera <Juan.Rivera@citrix.com>]
+
   *) mod_cache: Don't cache response header fields designated
      as hop-by-hop headers in HTTP/1.1 (RFC 2616 Section 13.5.1).
      [Estrade Matthieu <estrade-m@ifrance.com>, Brian Pane]

diff --git a/server/util_debug.c b/server/util_debug.c
index 14f1e251fdd5105fb908c33a2da8053b6982b8da..9cc66c7ec03045ada61b23624c556fcfa037086c 100644 (file)
--- a/server/util_debug.c
+++ b/server/util_debug.c
@@ -69,27 +69,27 @@
 #undef strrchr
 #undef strstr
 
-char *ap_strchr(char *s, int c)
+AP_DECLARE(char *) ap_strchr(char *s, int c)
 {
     return strchr(s,c);
 }
-const char *ap_strchr_c(const char *s, int c)
+AP_DECLARE(const char *) ap_strchr_c(const char *s, int c)
 {
     return strchr(s,c);
 }
-char *ap_strrchr(char *s, int c)
+AP_DECLARE(char *) ap_strrchr(char *s, int c)
 {
     return strrchr(s,c);
 }
-const char *ap_strrchr_c(const char *s, int c)
+AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c)
 {
     return strrchr(s,c);
 }
-char *ap_strstr(char *s, const char *c)
+AP_DECLARE(char *) ap_strstr(char *s, const char *c)
 {
     return strstr(s,c);
 }
-const char *ap_strstr_c(const char *s, const char *c)
+AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c)
 {
     return strstr(s,c);
 }