diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-06-07 16:41:12 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-06-07 16:41:12 +0000 |
| commit | 198dada00ef8032ec2e009d0998ea2499f93b9f1 (patch) | |
| tree | fb60c6e4c9d66fb4eeb23ece5348b36f5006854d /src/util | |
| parent | 1fbc60758a22c92d6999c933ed2c4f61c486887b (diff) | |
Reinstating the #ifdefed out regular expression stuff now that the gnu
regex stuff is in the source.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@548 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Misc.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/util/Misc.c b/src/util/Misc.c index 83a427ae..f255d437 100644 --- a/src/util/Misc.c +++ b/src/util/Misc.c @@ -706,20 +706,15 @@ int CCTK_SetLogical(int *data, const char *value) @@*/ -/* Joan had to change this for gcc under cygnus.... FUCK */ -#ifdef THISWASUNDERCYG int CCTK_RegexMatch(const char *string, const char *pattern, const int nmatch, - regexp *pmatch) - /* regmatch_t *pmatch) */ + regmatch_t *pmatch) { int status; - /* regex_t re; */ - regexp re; + regex_t re; -/* if (regcomp(&re, pattern, REG_EXTENDED) != 0) */ - if (regcomp(&re, pattern, (char *)0) != 0) + if (regcomp(&re, pattern, REG_EXTENDED) != 0) { return(0); /* report error */ } @@ -731,12 +726,3 @@ int CCTK_RegexMatch(const char *string, } return(1); } -#endif -int CCTK_RegexMatch(const char *string, - const char *pattern, - const int nmatch, - char* *pmatch) - -{ - return(1); - }
\ No newline at end of file |