diff options
| author | Gerd Moellmann | 2001-10-09 10:05:32 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-10-09 10:05:32 +0000 |
| commit | 5e5388f653157cb1836c30fc9131080d47e0a4b8 (patch) | |
| tree | 7730f6659a5aec170806b960cb9ee36864784118 /src | |
| parent | ded42dd3086a05416075ceae91972898ec889425 (diff) | |
| download | emacs-5e5388f653157cb1836c30fc9131080d47e0a4b8.tar.gz emacs-5e5388f653157cb1836c30fc9131080d47e0a4b8.zip | |
(WIDE_CHAR_SUPPORT): Do not use defined() in macro.
From Hallvard B Furuseth <h.b.furuseth@usit.uio.no>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/regex.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fcd316010fa..3b6120e1116 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-10-09 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * regex.c (WIDE_CHAR_SUPPORT): Do not use defined() in macro. | ||
| 4 | From Hallvard B Furuseth <h.b.furuseth@usit.uio.no>. | ||
| 5 | |||
| 1 | 2001-10-08 Andrew Innes <andrewi@gnu.org> | 6 | 2001-10-08 Andrew Innes <andrewi@gnu.org> |
| 2 | 7 | ||
| 3 | * lisp.h [max]: Undef min and max before redefining them. | 8 | * lisp.h [max]: Undef min and max before redefining them. |
diff --git a/src/regex.c b/src/regex.c index 9fe099c7125..38fc80437fd 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -49,8 +49,12 @@ | |||
| 49 | 49 | ||
| 50 | /* Whether to use ISO C Amendment 1 wide char functions. | 50 | /* Whether to use ISO C Amendment 1 wide char functions. |
| 51 | Those should not be used for Emacs since it uses its own. */ | 51 | Those should not be used for Emacs since it uses its own. */ |
| 52 | #if defined _LIBC | ||
| 53 | #define WIDE_CHAR_SUPPORT 1 | ||
| 54 | #else | ||
| 52 | #define WIDE_CHAR_SUPPORT \ | 55 | #define WIDE_CHAR_SUPPORT \ |
| 53 | (defined _LIBC || HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) | 56 | (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) |
| 57 | #endif | ||
| 54 | 58 | ||
| 55 | /* For platform which support the ISO C amendement 1 functionality we | 59 | /* For platform which support the ISO C amendement 1 functionality we |
| 56 | support user defined character classes. */ | 60 | support user defined character classes. */ |