summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclMain.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dd96cf8..1fb938c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-05 Kevin B. Kenny <kennykb@acm.org>
+
+ * generic/tclMain.c: Added missing conditional on _WIN32 around code
+ that messes around with the definition of _UNICODE, to correct a badly
+ broken Unix build from Jan's last commit.
+
2010-11-04 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tclDecls.h [FRQ 491789]: "setargv() doesn't support a unicode
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 93db15b..2695e6f 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -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: tclMain.c,v 1.53 2010/11/04 21:48:23 nijtmans Exp $
+ * RCS: @(#) $Id: tclMain.c,v 1.54 2010/11/04 23:56:07 kennykb Exp $
*/
/**
@@ -18,7 +18,7 @@
* TCL_ASCII_MAIN defined. This way both Tcl_Main and Tcl_MainExW
* can be implemented, sharing the same source code.
*/
-#ifndef TCL_ASCII_MAIN
+#if defined(_WIN32) && !defined(TCL_ASCII_MAIN)
# ifdef UNICODE
# undef UNICODE
# undef _UNICODE