You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@apache.org on 2003/06/17 11:45:57 UTC
cvs commit: httpd-2.0/include httpd.h
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 <bl...@orcaware.com>
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
Re: cvs commit: httpd-2.0/include httpd.h
Posted by Greg Stein <gs...@lyra.org>.
On Tue, Jun 17, 2003 at 08:33:20AM -0700, Justin Erenkrantz wrote:
> --On Tuesday, June 17, 2003 9:45 AM +0000 gstein@apache.org wrote:
>
> >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 <bl...@orcaware.com>
> > Reviewed by: rbb@rkbloom.net
>
> Um, shouldn't server/util.c be modified to keep the variable names in sync?
> If we fix it for the headers, it makes sense to change the compilation unit
> as well as server/util.c would have this shadowing problem as well. --
> justin
Hmm. Probably. My main motivation was to take it out of the public headers,
which was causing compilation warnings for third party modules
(*cough*svn*cough* :-).
If the .c code has 'exp', then yah...
/me goes to look...
--
Greg Stein, http://www.lyra.org/
Re: cvs commit: httpd-2.0/include httpd.h
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
--On Tuesday, June 17, 2003 9:45 AM +0000 gstein@apache.org wrote:
> 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 <bl...@orcaware.com>
> Reviewed by: rbb@rkbloom.net
Um, shouldn't server/util.c be modified to keep the variable names in sync?
If we fix it for the headers, it makes sense to change the compilation unit as
well as server/util.c would have this shadowing problem as well. -- justin