Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 30184 invoked by uid 500); 17 Jun 2003 09:45:59 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 30173 invoked by uid 500); 17 Jun 2003 09:45:59 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 17 Jun 2003 09:45:57 -0000 Message-ID: <20030617094557.31493.qmail@icarus.apache.org> From: gstein@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/include httpd.h X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N gstein 2003/06/17 02:45:57 Modified: include httpd.h Log: Use 'expected' rather than 'exp', as the latter shadows the exp() function in the math.h header. Some compilers don't like that. Submitted by: Blair Zajac Reviewed by: rbb@rkbloom.net Revision Changes Path 1.198 +4 -4 httpd-2.0/include/httpd.h Index: httpd.h =================================================================== RCS file: /home/cvs/httpd-2.0/include/httpd.h,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- httpd.h 9 May 2003 21:37:06 -0000 1.197 +++ httpd.h 17 Jun 2003 09:45:57 -0000 1.198 @@ -1450,18 +1450,18 @@ /** * Determine if a string matches a patterm containing the wildcards '?' or '*' * @param str The string to check - * @param exp The pattern to match against + * @param expected The pattern to match against * @return 1 if the two strings match, 0 otherwise */ -AP_DECLARE(int) ap_strcmp_match(const char *str, const char *exp); +AP_DECLARE(int) ap_strcmp_match(const char *str, const char *expected); /** * Determine if a string matches a patterm containing the wildcards '?' or '*', * ignoring case * @param str The string to check - * @param exp The pattern to match against + * @param expected The pattern to match against * @return 1 if the two strings match, 0 otherwise */ -AP_DECLARE(int) ap_strcasecmp_match(const char *str, const char *exp); +AP_DECLARE(int) ap_strcasecmp_match(const char *str, const char *expected); /** * Find the first occurrence of the substring s2 in s1, regardless of case