diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-08 14:38:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-11-08 14:38:58 (GMT) |
| commit | f0aca5d1127c20a130c784e7555cd84bcb2748b3 (patch) | |
| tree | c8932186e22746454d98277e2408ce64f67bf3d5 /generic | |
| parent | d99627e7be69b7a881a5d57aab6f17b27b19d244 (diff) | |
| parent | 1aafdd134e0b8454e83bc659eeb7f7dd2c5b2006 (diff) | |
| download | tcl-f0aca5d1127c20a130c784e7555cd84bcb2748b3.zip tcl-f0aca5d1127c20a130c784e7555cd84bcb2748b3.tar.gz tcl-f0aca5d1127c20a130c784e7555cd84bcb2748b3.tar.bz2 | |
Merge trunk (order of man.macros inclusion).
Simplify TCLAPI definition: Since there are extern "C" guards around all TCLAPI usage, the definition itself doesn't need special C++ handling any more.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 6 | ||||
| -rwxr-xr-x | generic/tclDecls.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 4cbcebf..02b4750 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -215,8 +215,6 @@ extern "C" { #ifdef BUILD_tcl # define TCLAPI extern DLLEXPORT -#elif defined(__cplusplus) -# define TCLAPI extern "C" DLLIMPORT #else # define TCLAPI extern DLLIMPORT #endif @@ -2227,6 +2225,10 @@ TCLAPI void Tcl_FindExecutable(const char *argv0); TCLAPI void Tcl_SetPanicProc(Tcl_PanicProc *panicProc); TCLAPI void Tcl_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); +#if defined(_WIN32) && defined(UNICODE) +TCLAPI void Tcl_MainExW(int argc, wchar_t **argv, + Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); +#endif TCLAPI 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 7a000c5..6074c98 100755 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3681,8 +3681,6 @@ extern const TclStubs *tclStubsPtr; #if defined(_WIN32) && defined(UNICODE) # define Tcl_FindExecutable(arg) ((Tcl_FindExecutable)((const char *)(arg))) # define Tcl_MainEx Tcl_MainExW -TCLAPI void Tcl_MainExW(int argc, wchar_t **argv, - Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); #endif #define Tcl_PkgPresent(interp, name, version, exact) \ |