summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2012-06-26 20:00:33 +0300
committerEli Zaretskii <eliz@gnu.org>2012-06-26 20:00:33 +0300
commitf6f62d1bee8de436859f1571c19876bc3ba4f6e3 (patch)
tree1d185378db75bafbb4ed10722b71c14a3aea97f3
parentcc06e7e7107b47250ad2a91817932b8079f4bc6e (diff)
downloademacs-f6f62d1bee8de436859f1571c19876bc3ba4f6e3.tar.gz
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.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/s/ms-w32.h8
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 @@
+2012-06-26 Eli Zaretskii <eliz@gnu.org>
+
+ * s/ms-w32.h (strcasecmp, strncasecmp) [_MSC_VER]: Redirect to
+ _stricmp and _strnicmp.
+ (HAVE_STRCASECMP, HAVE_STRNCASECMP): Define to 1.
+
2012-06-26 Dmitry Antipov <dmantipov@yandex.ru>
* 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 {
#undef HAVE_AIX_SMT_EXP
#define USE_TOOLKIT_SCROLL_BARS 1
+/* MinGW has these in its library; MSVC doesn't. */
+#ifdef _MSC_VER
+#define strcasecmp(s1,s2) _stricmp(s1,s2)
+#define strncasecmp(s1,s2) _strnicmp(s1,s2)
+#endif
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+
/* Define if you have the ANSI `strerror' function.
Otherwise you must have the variable `char *sys_errlist[]'. */
#define HAVE_STRERROR 1