summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--generic/tkMain.c13
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5aa7388..e46fe01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* library/demos/widget Use unicode copyright sign, in stead
* library/demos/en.msg of depending on translation.
* library/demos/nl.msg
+ * generic/tkMain.c: Sync TK_ASCII_MAIN usage with tclMain.c
2010-11-04 Don Porter <dgp@users.sourceforge.net>
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 96c6159..71927c3 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMain.c,v 1.34 2010/09/29 20:10:57 nijtmans Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.35 2010/11/05 08:20:00 nijtmans Exp $
*/
/**
@@ -21,9 +21,14 @@
* TK_ASCII_MAIN defined. This way both Tk_MainEx and Tk_MainExW
* can be implemented, sharing the same source code.
*/
-#ifndef TK_ASCII_MAIN
-# undef UNICODE
-# undef _UNICODE
+#if defined(TK_ASCII_MAIN)
+# ifdef UNICODE
+# undef UNICODE
+# undef _UNICODE
+# else
+# define UNICODE
+# define _UNICODE
+# endif
#endif
#include <ctype.h>