summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-30 06:33:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-08-30 06:33:29 (GMT)
commitc14c0cb9b1f94390b3e110a359a5506c892cda44 (patch)
tree0ad16dbe6a4d877af7093a1eca2902f8116f8da6
parentb8db328a5dc663435c02e2b2a67f3d66e16602c9 (diff)
downloadtcl-c14c0cb9b1f94390b3e110a359a5506c892cda44.zip
tcl-c14c0cb9b1f94390b3e110a359a5506c892cda44.tar.gz
tcl-c14c0cb9b1f94390b3e110a359a5506c892cda44.tar.bz2
Tcl_MainEx() (like Tk_MainEx())rfe_1711975
-rw-r--r--generic/tcl.h6
-rw-r--r--generic/tclDecls.h2
-rw-r--r--generic/tclMain.c3
3 files changed, 6 insertions, 5 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 54bfedc..177126a 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2373,8 +2373,10 @@ const char * TclTomMathInitializeStubs(Tcl_Interp *interp,
* Tcl_GetMemoryInfo is needed for AOLserver. [Bug 1868171]
*/
-EXTERN void Tcl_Main(int argc, char **argv,
- Tcl_AppInitProc *appInitProc);
+#define Tcl_Main(argc, argv, proc) Tcl_MainEx(argc, argv, proc, \
+ (Tcl_FindExecutable(argv[0]), (Tcl_CreateInterp)()))
+EXTERN void Tcl_MainEx(int argc, char **argv,
+ Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
EXTERN const char * Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
const char *version, int exact);
#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 1df7e14..1f7dfe6 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3791,8 +3791,6 @@ extern const TclStubs *tclStubsPtr;
# define Tcl_MainEx Tcl_MainExW
EXTERN void Tcl_MainExW(int argc, wchar_t **argv,
Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
-# define Tcl_Main(argc, argv, proc) Tcl_MainExW(argc, argv, proc, \
- (Tcl_FindExecutable(argv[0]), (Tcl_CreateInterp)()))
#endif
#undef TCL_STORAGE_CLASS
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 114d2c3..58ad377 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -621,7 +621,8 @@ Tcl_MainEx(
}
#ifndef UNICODE
-void
+#undef Tcl_Main
+extern DLLEXPORT void
Tcl_Main(
int argc, /* Number of arguments. */
TCHAR **argv, /* Array of argument strings. */