diff options
| author | Ken Raeburn | 2017-07-31 01:13:53 -0400 |
|---|---|---|
| committer | Ken Raeburn | 2017-07-31 01:13:53 -0400 |
| commit | 13f3370400031e2ac1c9be0932f411370fc6984e (patch) | |
| tree | 06f349b2b0f1cda9e36f7c4390d9d2d9bf49303c /src/regex.h | |
| parent | cd0966b33c1fe975520e85e0e7af82c09e4754dc (diff) | |
| parent | dcfcaf40d577808d640016c886d4fae7280a7fd5 (diff) | |
| download | emacs-scratch/raeburn-startup.tar.gz emacs-scratch/raeburn-startup.zip | |
; Merge from branch 'master'scratch/raeburn-startup
Diffstat (limited to 'src/regex.h')
| -rw-r--r-- | src/regex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/regex.h b/src/regex.h index 1d439de259c..5e3a79763ec 100644 --- a/src/regex.h +++ b/src/regex.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #define _REGEX_H 1 | 21 | #define _REGEX_H 1 |
| 22 | 22 | ||
| 23 | #if defined emacs && (defined _REGEX_RE_COMP || defined _LIBC) | 23 | #if defined emacs && (defined _REGEX_RE_COMP || defined _LIBC) |
| 24 | /* We’re not defining re_set_syntax and using a different prototype of | 24 | /* We're not defining re_set_syntax and using a different prototype of |
| 25 | re_compile_pattern when building Emacs so fail compilation early with | 25 | re_compile_pattern when building Emacs so fail compilation early with |
| 26 | a (somewhat helpful) error message when conflict is detected. */ | 26 | a (somewhat helpful) error message when conflict is detected. */ |
| 27 | # error "_REGEX_RE_COMP nor _LIBC can be defined if emacs is defined." | 27 | # error "_REGEX_RE_COMP nor _LIBC can be defined if emacs is defined." |