From 49fd7c8005a1490c65eb6488eda416376ff2afce Mon Sep 17 00:00:00 2001 From: nijtmans Date: Fri, 5 Nov 2010 08:16:45 +0000 Subject: fix TCL_ASCII_MAIN usage, as the name suggests FossilOrigin-Name: ddecce42f0be771c674af4848b78f3761adfa47c --- ChangeLog | 5 +++++ generic/tclMain.c | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fb938c..e4cb0db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-11-05 Jan Nijtmans + + * generic/tclMain.c: Thanks, Kevin, for the fix, but this how it was + supposed to be (TCL_ASCII_MAIN is only supposed to be defined on WIN32). + 2010-11-05 Kevin B. Kenny * generic/tclMain.c: Added missing conditional on _WIN32 around code diff --git a/generic/tclMain.c b/generic/tclMain.c index 2695e6f..a94d68d 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.54 2010/11/04 23:56:07 kennykb Exp $ + * RCS: @(#) $Id: tclMain.c,v 1.55 2010/11/05 08:16:46 nijtmans 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. */ -#if defined(_WIN32) && !defined(TCL_ASCII_MAIN) +#if defined(TCL_ASCII_MAIN) # ifdef UNICODE # undef UNICODE # undef _UNICODE @@ -652,9 +652,8 @@ Tcl_MainEx( Tcl_Release(interp); Tcl_Exit(exitCode); } - -#ifndef TCL_ASCII_MAIN -#undef Tcl_Main + +#ifndef UNICODE void Tcl_Main( int argc, /* Number of arguments. */ @@ -667,6 +666,9 @@ Tcl_Main( Tcl_FindExecutable(argv[0]); Tcl_MainEx(argc, argv, appInitProc, Tcl_CreateInterp()); } +#endif + +#ifndef TCL_ASCII_MAIN /* *--------------------------------------------------------------- -- cgit v0.12