From 01e747d66bb25d018cd504121d9682d5c512f3df Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Mon, 19 Apr 2010 07:40:41 +0000
Subject: Fix [Patch 2986105]: conditionally defining strcasecmp/strncasecmp

---
 ChangeLog        |  5 +++++
 win/tclWinFile.c |  8 ++++----
 win/tclWinPort.h | 44 ++++++++++++++++++++++++--------------------
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88c4d9f..b0cc4bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-19  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/tclWinPort.h  Fix [Patch 2986105]: conditionally defining
+	* win/tclWinFile.c  strcasecmp/strncasecmp
+
 2010-04-18  Donal K. Fellows  <dkf@users.sf.net>
 
 	* doc/unset.n: [Bug 2988940]: Fix typo.
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 7399e22..61e73c6 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinFile.c,v 1.95.2.3 2010/01/31 23:51:37 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinFile.c,v 1.95.2.4 2010/04/19 07:40:41 nijtmans Exp $
  */
 
 /* #define _WIN32_WINNT	0x0500 */
@@ -1776,9 +1776,9 @@ NativeIsExec(
 	 * Use wide-char case-insensitive comparison
 	 */
 
-	if ((wcscasecmp(path+len-3, L"exe") == 0)
-		|| (wcscasecmp(path+len-3, L"com") == 0)
-		|| (wcscasecmp(path+len-3, L"bat") == 0)) {
+	if ((_wcsicmp(path+len-3, L"exe") == 0)
+		|| (_wcsicmp(path+len-3, L"com") == 0)
+		|| (_wcsicmp(path+len-3, L"bat") == 0)) {
 	    return 1;
 	}
     } else {
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 039ba33..1063b88 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinPort.h,v 1.50.2.1 2010/01/31 23:51:37 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.50.2.2 2010/04/19 07:40:41 nijtmans Exp $
  */
 
 #ifndef _TCLWINPORT
@@ -58,14 +58,18 @@
 #include <signal.h>
 #include <string.h>
 
-/*
- * These string functions are not defined with the same names on Windows.
- */
-
-#ifndef __CYGWIN__
-#define wcscasecmp _wcsicmp
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
+#ifdef __CYGWIN__
+#   include <unistd.h>
+#   ifndef _wcsicmp
+#	define _wcsicmp wcscasecmp
+#   endif
+#else
+#   ifndef strncasecmp
+#	define strncasecmp strnicmp
+#   endif
+#   ifndef strcasecmp
+#	define strcasecmp stricmp
+#   endif
 #endif
 
 /*
@@ -305,7 +309,7 @@
  */
 
 #ifndef S_IFLNK
-#define S_IFLNK        0120000  /* Symbolic Link */
+#   define S_IFLNK        0120000  /* Symbolic Link */
 #endif
 
 #ifndef S_ISREG
@@ -357,11 +361,11 @@
  */
 
 #ifndef MAXPATH
-#define MAXPATH MAX_PATH
+#   define MAXPATH MAX_PATH
 #endif /* MAXPATH */
 
 #ifndef MAXPATHLEN
-#define MAXPATHLEN MAXPATH
+#   define MAXPATHLEN MAXPATH
 #endif /* MAXPATHLEN */
 
 /*
@@ -382,13 +386,13 @@
  */
 
 #if defined(_MSC_VER) || defined(__MINGW32__)
-#    define environ _environ
-#    define hypot _hypot
-#    define exception _exception
-#    undef EDEADLOCK
-#    if defined(__MINGW32__) && !defined(__MSVCRT__)
+#   define environ _environ
+#   define hypot _hypot
+#   define exception _exception
+#   undef EDEADLOCK
+#   if defined(__MINGW32__) && !defined(__MSVCRT__)
 #	define timezone _timezone
-#    endif
+#   endif
 #endif /* _MSC_VER || __MINGW32__ */
 
 /*
@@ -402,8 +406,8 @@
 
 #ifdef __CYGWIN__
 /* On Cygwin, the environment is imported from the Cygwin DLL. */
-#    define putenv TclCygwinPutenv
-#    define timezone _timezone
+#   define putenv TclCygwinPutenv
+#   define timezone _timezone
 #endif /* __CYGWIN__ */
 
 
-- 
cgit v0.12