diff options
| author | peter <peter@FreeBSD.org> | 2002-12-02 03:13:37 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-12-02 03:13:37 +0000 |
| commit | c88e7301411c002ff913342f1619967f7c3b58e7 (patch) | |
| tree | 41e3ca13c2d66973453a5c0ea9b349da9618bfdb /contrib/cvs/lib/regex.h | |
| parent | 64d3246a13e0c323164816b3820e24af7b8f003e (diff) | |
| parent | 3dc96f7243ece1d1f7f87b03334f840415e0db63 (diff) | |
| download | FreeBSD-src-c88e7301411c002ff913342f1619967f7c3b58e7.zip FreeBSD-src-c88e7301411c002ff913342f1619967f7c3b58e7.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r107484,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/cvs/lib/regex.h')
| -rw-r--r-- | contrib/cvs/lib/regex.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/contrib/cvs/lib/regex.h b/contrib/cvs/lib/regex.h index 411e7d2..6c0c850 100644 --- a/contrib/cvs/lib/regex.h +++ b/contrib/cvs/lib/regex.h @@ -490,6 +490,29 @@ extern int re_exec _RE_ARGS (()); #endif /* POSIX compatibility. */ +/* CVS - DRP + * + * If the OS defines this, just redefine the names to avoid namespace + * clashes. In theory, we should be testing the built in functions to + * see if they do what we want and use them if possible, but this is + * easier... + * + * Namely, this was occurring under Mac OS X. This is a Mac OS X (or + * OS X related) bug. + */ +#ifdef HAVE_REGCOMP +# define regcomp cvs_regcomp +#endif /* HAVE_REGCOMP */ +#ifdef HAVE_REGERROR +# define regerror cvs_regerror +#endif /* HAVE_REGERROR */ +#ifdef HAVE_REGEXEC +# define regexec cvs_regexec +#endif /* HAVE_REGEXEC */ +#ifdef HAVE_REGFREE +# define regfree cvs_regfree +#endif /* HAVE_REGFREE */ + extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags)); extern int regexec _RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch, |
