diff options
| author | Eli Zaretskii | 2012-06-26 20:00:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-06-26 20:00:33 +0300 |
| commit | f6f62d1bee8de436859f1571c19876bc3ba4f6e3 (patch) | |
| tree | 1d185378db75bafbb4ed10722b71c14a3aea97f3 /src | |
| parent | cc06e7e7107b47250ad2a91817932b8079f4bc6e (diff) | |
| download | emacs-f6f62d1bee8de436859f1571c19876bc3ba4f6e3.tar.gz emacs-f6f62d1bee8de436859f1571c19876bc3ba4f6e3.zip | |
Define HAVE_STRCASECMP and HAVE_STRNCASECMP on MS-Windows.
src/s/ms-w32.h (strcasecmp, strncasecmp) [_MSC_VER]: Redirect to
_stricmp and _strnicmp.
(HAVE_STRCASECMP, HAVE_STRNCASECMP): Define to 1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/s/ms-w32.h | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c7922ee8a8c..ef1f210ba66 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-06-26 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * s/ms-w32.h (strcasecmp, strncasecmp) [_MSC_VER]: Redirect to | ||
| 4 | _stricmp and _strnicmp. | ||
| 5 | (HAVE_STRCASECMP, HAVE_STRNCASECMP): Define to 1. | ||
| 6 | |||
| 1 | 2012-06-26 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2012-06-26 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 8 | ||
| 3 | * alloc.c (allocate_window): Zero out non-Lisp part of newly | 9 | * alloc.c (allocate_window): Zero out non-Lisp part of newly |
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 20603562afa..38e368e5bd2 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h | |||
| @@ -165,6 +165,14 @@ struct sigaction { | |||
| 165 | #undef HAVE_AIX_SMT_EXP | 165 | #undef HAVE_AIX_SMT_EXP |
| 166 | #define USE_TOOLKIT_SCROLL_BARS 1 | 166 | #define USE_TOOLKIT_SCROLL_BARS 1 |
| 167 | 167 | ||
| 168 | /* MinGW has these in its library; MSVC doesn't. */ | ||
| 169 | #ifdef _MSC_VER | ||
| 170 | #define strcasecmp(s1,s2) _stricmp(s1,s2) | ||
| 171 | #define strncasecmp(s1,s2) _strnicmp(s1,s2) | ||
| 172 | #endif | ||
| 173 | #define HAVE_STRCASECMP 1 | ||
| 174 | #define HAVE_STRNCASECMP 1 | ||
| 175 | |||
| 168 | /* Define if you have the ANSI `strerror' function. | 176 | /* Define if you have the ANSI `strerror' function. |
| 169 | Otherwise you must have the variable `char *sys_errlist[]'. */ | 177 | Otherwise you must have the variable `char *sys_errlist[]'. */ |
| 170 | #define HAVE_STRERROR 1 | 178 | #define HAVE_STRERROR 1 |