diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
| commit | 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch) | |
| tree | c0efd5c0a208640c0a883f4566df1b40caa3aaad /src/regex.c | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
| download | emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.gz emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.bz2 emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.zip | |
Merge from trunk.
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/regex.c b/src/regex.c index 862f848976c..545a198acd7 100644 --- a/src/regex.c +++ b/src/regex.c @@ -6381,8 +6381,7 @@ char * regcomp/regexec below without link errors. */ weak_function # endif -re_comp (s) - const char *s; +re_comp (const char *s) { reg_errcode_t ret; @@ -6421,7 +6420,7 @@ re_comp (s) } -regoff_t +int # ifdef _LIBC weak_function # endif @@ -6558,7 +6557,7 @@ reg_errcode_t regexec (const regex_t *__restrict preg, const char *__restrict string, size_t nmatch, regmatch_t pmatch[__restrict_arr], int eflags) { - reg_errcode_t ret; + regoff_t ret; struct re_registers regs; regex_t private_preg; size_t len = strlen (string); |