summaryrefslogtreecommitdiffstats
path: root/generic/tclMain.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-09-16 08:12:48 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-09-16 08:12:48 (GMT)
commit679c72e5a2c14ab53b227e058c4ef06edde6b7a4 (patch)
treeb28a3a30c684e4377f39e18d3b4689891cab876b /generic/tclMain.c
parentfe0e5c84250f9e45fcbf320d121a961c767b3b5a (diff)
parentef09f86d39a751b46143aa33f2ee808b31a6a984 (diff)
downloadtcl-679c72e5a2c14ab53b227e058c4ef06edde6b7a4.zip
tcl-679c72e5a2c14ab53b227e058c4ef06edde6b7a4.tar.gz
tcl-679c72e5a2c14ab53b227e058c4ef06edde6b7a4.tar.bz2
merge trunk to feature branchtip_388_impl
Diffstat (limited to 'generic/tclMain.c')
-rw-r--r--generic/tclMain.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 114d2c3..373e3f6 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -620,18 +620,19 @@ Tcl_MainEx(
Tcl_Exit(exitCode);
}
-#ifndef UNICODE
-void
+#if (TCL_MAJOR_VERSION == 8) && !defined(UNICODE)
+#undef Tcl_Main
+extern DLLEXPORT void
Tcl_Main(
int argc, /* Number of arguments. */
- TCHAR **argv, /* Array of argument strings. */
+ char **argv, /* Array of argument strings. */
Tcl_AppInitProc *appInitProc)
/* Application-specific initialization
* function to call after most initialization
* but before starting to execute commands. */
{
Tcl_FindExecutable(argv[0]);
- Tcl_MainEx(argc, argv, appInitProc, Tcl_CreateInterp());
+ Tcl_MainEx(argc, argv, appInitProc, Tcl_CreateInterp());
}
#endif