From 87324c88ebe806ed01c6794a13febf7d00f61e2c Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Mon, 18 Nov 2002 21:43:13 +0000 Subject: [PATCH] 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 Reviewed by: Jeff Trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97565 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ server/util_debug.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 22163b5772..1805dca7a9 100644 --- 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 ] + *) 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 , Brian Pane] diff --git a/server/util_debug.c b/server/util_debug.c index 14f1e251fd..9cc66c7ec0 100644 --- 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); } -- 2.40.0