diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2003-02-24 23:12:10 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2003-02-24 23:12:10 +0000 |
| commit | 95b03e8986d9911c26a354c5c254249bb7b2aef2 (patch) | |
| tree | c5a67e0870304b55f92127c144ed4a1ff01758e0 /include/apr_fnmatch.h | |
| parent | 41c771dd94f80b9a10bf7285bb0ab85d2c1c5f1b (diff) | |
| download | apr-95b03e8986d9911c26a354c5c254249bb7b2aef2.tar.gz | |
Namespace protection, thanks to Craig Rodrigues <rodrigc@attbi.com>
for the original patch. We deprecate these symbols till we can eradicate
them from APR 1.0.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@64377 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr_fnmatch.h')
| -rw-r--r-- | include/apr_fnmatch.h | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/include/apr_fnmatch.h b/include/apr_fnmatch.h index 48fc4d9e7..3dfe6d666 100644 --- a/include/apr_fnmatch.h +++ b/include/apr_fnmatch.h @@ -53,25 +53,32 @@ extern "C" { #endif -#define FNM_NOMATCH 1 /**< Match failed. */ +#define APR_FNM_NOMATCH 1 /**< Match failed. */ -#define FNM_NOESCAPE 0x01 /**< Disable backslash escaping. */ -#define FNM_PATHNAME 0x02 /**< Slash must be matched by slash. */ -#define FNM_PERIOD 0x04 /**< Period must be matched by period. */ - -#define FNM_CASE_BLIND 0x08 /**< Compare characters case-insensitively. @remark This flag is an Apache addition */ +#define APR_FNM_NOESCAPE 0x01 /**< Disable backslash escaping. */ +#define APR_FNM_PATHNAME 0x02 /**< Slash must be matched by slash. */ +#define APR_FNM_PERIOD 0x04 /**< Period must be matched by period. */ +#define APR_FNM_CASE_BLIND 0x08 /**< Compare characters case-insensitively. + * @remark This flag is an Apache addition + */ + +#define FNM_NOMATCH APR_FNM_NOMATCH /**< @deprecated */ +#define FNM_NOESCAPE APR_FNM_NOESCAPE /**< @deprecated */ +#define FNM_PATHNAME APR_FNM_PATHNAME /**< @deprecated */ +#define FNM_PERIOD APR_FNM_PERIOD /**< @deprecated */ +#define FNM_CASE_BLIND APR_FNM_CASE_BLIND /**< @deprecated */ /** * Try to match the string to the given pattern, return APR_SUCCESS if - * match, else return FNM_NOMATCH. + * match, else return APR_FNM_NOMATCH. * @param pattern The pattern to match to * @param strings The string we are trying to match * @param flags flags to use in the match. Bitwise OR of: * <PRE> - * FNM_NOESCAPE Disable backslash escaping - * FNM_PATHNAME Slash must be matched by slash - * FNM_PERIOD Period must be matched by period - * FNM_CASE_BLIND Compare characters case-insensitively. + * APR_FNM_NOESCAPE Disable backslash escaping + * APR_FNM_PATHNAME Slash must be matched by slash + * APR_FNM_PERIOD Period must be matched by period + * APR_FNM_CASE_BLIND Compare characters case-insensitively. * </PRE> */ |