diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-12-05 22:50:44 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-12-05 22:50:44 +0200 |
| commit | 66a5abb102ec1d6e4c327632ef235d1eb6433291 (patch) | |
| tree | 9e894dfb5dcf42869bff94987d7ab5628ea71358 /src/regex.c | |
| parent | e4deba098e0281538a0e7b04d849989f17e5bcc7 (diff) | |
| download | emacs-66a5abb102ec1d6e4c327632ef235d1eb6433291.tar.gz | |
Fix compilation problems.
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/regex.c b/src/regex.c index bb046858dfe..e7231d3882b 100644 --- a/src/regex.c +++ b/src/regex.c @@ -1146,7 +1146,6 @@ print_double_string (re_char *where, re_char *string1, ssize_t size1, /* This has no initializer because initialized variables in Emacs become read-only after dumping. */ reg_syntax_t re_syntax_options; -#endif /* Specify the precise syntax of regexps for compilation. This provides @@ -1166,20 +1165,7 @@ re_set_syntax (reg_syntax_t syntax) } WEAK_ALIAS (__re_set_syntax, re_set_syntax) -#ifndef emacs -/* Regexp to use to replace spaces, or NULL meaning don't. */ -static const_re_char *whitespace_regexp; -#else -/* whitespace_regexp is a macro defined in thread.h. */ #endif - -void -re_set_whitespace_regexp (const char *regexp) -{ - whitespace_regexp = (const_re_char *) regexp; -} -WEAK_ALIAS (__re_set_syntax, re_set_syntax) ->>>>>>> concurrency /* This table gives an error message for each of the error codes listed in regex.h. Obviously the order here has to be same as there. |