From: <ai...@us...> - 2013-11-18 21:45:25
|
Revision: 12713 http://sourceforge.net/p/plplot/code/12713 Author: airwin Date: 2013-11-18 21:45:22 +0000 (Mon, 18 Nov 2013) Log Message: ----------- Replace call to private TclObjCommandComplete with combination of public calls to Tcl_GetString and Tcl_CommandComplete. Modified Paths: -------------- trunk/bindings/tcl/tclMain.c Modified: trunk/bindings/tcl/tclMain.c =================================================================== --- trunk/bindings/tcl/tclMain.c 2013-11-18 20:17:42 UTC (rev 12712) +++ trunk/bindings/tcl/tclMain.c 2013-11-18 21:45:22 UTC (rev 12713) @@ -54,10 +54,6 @@ #define TclFormatInt( buf, n ) sprintf( ( buf ), "%ld", (long) ( n ) ) -#ifndef TclObjCommandComplete_TCL_DECLARED -EXTERN int TclObjCommandComplete _ANSI_ARGS_( ( Tcl_Obj * cmdPtr ) ); -#endif - # undef TCL_STORAGE_CLASS # define TCL_STORAGE_CLASS DLLEXPORT @@ -68,8 +64,10 @@ // linked into the application. // -EXTERN int Tcl_LinkVar( ); -int ( *tclDummyLinkVarPtr )() = Tcl_LinkVar; +// Experiments show this is no longer required, and in any case +// it screws up using the Tcl stub library. So comment out (AWI). +//EXTERN int Tcl_LinkVar( ); +//int ( *tclDummyLinkVarPtr )() = Tcl_LinkVar; // // Declarations for various library procedures and variables (don't want @@ -90,7 +88,7 @@ static void plPrepOutputHandler( Tcl_Interp *interp, int code, int tty ); -// Other functio prototypes +// Other function prototypes void TclSetStartupScriptFileName( char *fileName ); const char *TclGetStartupScriptFileName( void ); @@ -423,7 +421,7 @@ // Tcl_AppendToObj( commandPtr, "\n", 1 ); - if ( !TclObjCommandComplete( commandPtr ) ) + if ( !Tcl_CommandComplete( Tcl_GetString( commandPtr ) ) ) { gotPartial = 1; continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |