From: <and...@us...> - 2008-12-15 12:40:49
|
Revision: 9116 http://plplot.svn.sourceforge.net/plplot/?rev=9116&view=rev Author: andrewross Date: 2008-12-15 12:40:45 +0000 (Mon, 15 Dec 2008) Log Message: ----------- No need to set USINGDLL and include pldll.h in tclMain.c since -DUSINGDLL is set on the command line by cmake and pldll.h is included by plplot.h. Removes gcc warning about redefining USINGDLL. Modified Paths: -------------- trunk/bindings/tcl/tclMain.c Modified: trunk/bindings/tcl/tclMain.c =================================================================== --- trunk/bindings/tcl/tclMain.c 2008-12-15 11:58:19 UTC (rev 9115) +++ trunk/bindings/tcl/tclMain.c 2008-12-15 12:40:45 UTC (rev 9116) @@ -50,8 +50,6 @@ #include <tcl.h> #include "plplot.h" -#define USINGDLL -#include "pldll.h" #ifdef HAVE_TCL_GT_84 /* From (private) tclInt.h in tcl8.5 */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2010-01-28 08:03:26
|
Revision: 10772 http://plplot.svn.sourceforge.net/plplot/?rev=10772&view=rev Author: arjenmarkus Date: 2010-01-28 08:03:13 +0000 (Thu, 28 Jan 2010) Log Message: ----------- Replace HAVE_TCL_GT_84 by the macros TCL_MAJOR_VERSION and TCL_MINOR_VERSION from the Tcl include file. This way the definition of TclFormatInt no longer depends on the version found from tclsh. (This led to link problems if there was a discrepancy between the include files found by CMake and the Tcl shell). Note that we can simplify the configuration procedure as a consequence. Modified Paths: -------------- trunk/bindings/tcl/tclMain.c Modified: trunk/bindings/tcl/tclMain.c =================================================================== --- trunk/bindings/tcl/tclMain.c 2010-01-27 14:35:23 UTC (rev 10771) +++ trunk/bindings/tcl/tclMain.c 2010-01-28 08:03:13 UTC (rev 10772) @@ -51,7 +51,7 @@ #include <tcl.h> #include "plplot.h" -#ifdef HAVE_TCL_GT_84 +#ifdef TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 5 /* From (private) tclInt.h in tcl8.5 */ #define TclFormatInt( buf, n ) sprintf(( buf ), "%ld", (long) ( n )) #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2010-01-28 08:52:16
|
Revision: 10773 http://plplot.svn.sourceforge.net/plplot/?rev=10773&view=rev Author: arjenmarkus Date: 2010-01-28 08:52:09 +0000 (Thu, 28 Jan 2010) Log Message: ----------- Correct the #ifdef TCL_MAJOR_VERSION ... - it should be #if Modified Paths: -------------- trunk/bindings/tcl/tclMain.c Modified: trunk/bindings/tcl/tclMain.c =================================================================== --- trunk/bindings/tcl/tclMain.c 2010-01-28 08:03:13 UTC (rev 10772) +++ trunk/bindings/tcl/tclMain.c 2010-01-28 08:52:09 UTC (rev 10773) @@ -51,7 +51,7 @@ #include <tcl.h> #include "plplot.h" -#ifdef TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 5 +#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 5 /* From (private) tclInt.h in tcl8.5 */ #define TclFormatInt( buf, n ) sprintf(( buf ), "%ld", (long) ( n )) #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2010-12-22 08:12:26
|
Revision: 11383 http://plplot.svn.sourceforge.net/plplot/?rev=11383&view=rev Author: arjenmarkus Date: 2010-12-22 08:12:20 +0000 (Wed, 22 Dec 2010) Log Message: ----------- Solve bug 3140458 - replace the code that accessed the Tcl internals by a call to Tcl_GetStringResult(). Also removed the #ifdefs involving TCL_MEM_DEBUG via the patch by Brad Harder: - Tcl_InitMemory() is a no-op if memory debugging is not enabled - The clean-up code relied on a non-declared variable, so could never have worked. The purpose of the code was not clear either. Modified Paths: -------------- trunk/bindings/tcl/tclMain.c Modified: trunk/bindings/tcl/tclMain.c =================================================================== --- trunk/bindings/tcl/tclMain.c 2010-12-21 08:46:53 UTC (rev 11382) +++ trunk/bindings/tcl/tclMain.c 2010-12-22 08:12:20 UTC (rev 11383) @@ -234,9 +234,7 @@ Tcl_FindExecutable( argv[0] ); interp = Tcl_CreateInterp(); -#ifdef TCL_MEM_DEBUG - Tcl_InitMemory( interp ); -#endif + Tcl_InitMemory( interp ); //no-op if TCL_MEM_DEBUG undefined // First process plplot-specific args using the PLplot parser. @@ -314,7 +312,7 @@ code = Tcl_VarEval( interp, tclStartupScript, (char *) NULL ); if ( code != TCL_OK ) { - fprintf( stderr, "%s\n", interp->result ); + fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) ); exitCode = 1; } } @@ -471,14 +469,6 @@ } } } -#ifdef TCL_MEM_DEBUG - if ( tclMemDumpFileName != NULL ) - { - Tcl_DecrRefCount( commandPtr ); - Tcl_DeleteInterp( interp ); - Tcl_Exit( 0 ); - } -#endif } // This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-12-01 23:40:02
|
Revision: 12086 http://plplot.svn.sourceforge.net/plplot/?rev=12086&view=rev Author: andrewross Date: 2011-12-01 23:39:56 +0000 (Thu, 01 Dec 2011) Log Message: ----------- Function definition is not needed as the function is already defined in the headers. Fixes compiler warning. Modified Paths: -------------- trunk/bindings/tcl/tclMain.c Modified: trunk/bindings/tcl/tclMain.c =================================================================== --- trunk/bindings/tcl/tclMain.c 2011-12-01 23:38:31 UTC (rev 12085) +++ trunk/bindings/tcl/tclMain.c 2011-12-01 23:39:56 UTC (rev 12086) @@ -74,7 +74,7 @@ // linked into the application. // -EXTERN int Tcl_LinkVar(); +//EXTERN int Tcl_LinkVar( ); int ( *tclDummyLinkVarPtr )() = Tcl_LinkVar; // This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2013-11-14 07:54:27
|
Revision: 12696 http://sourceforge.net/p/plplot/code/12696 Author: arjenmarkus Date: 2013-11-14 07:54:24 +0000 (Thu, 14 Nov 2013) Log Message: ----------- Always use TclFormatInt as a macro, instead of relying on its presence in the Tcl library for older versions of Tcl. It is used only once in the code, so that the performance advantages the function offers are of no interest. The original code caused problems in some cases, even though the Tcl version used was 8.5 or later. Modified Paths: -------------- trunk/bindings/tcl/tclMain.c Modified: trunk/bindings/tcl/tclMain.c =================================================================== --- trunk/bindings/tcl/tclMain.c 2013-11-13 23:53:45 UTC (rev 12695) +++ trunk/bindings/tcl/tclMain.c 2013-11-14 07:54:24 UTC (rev 12696) @@ -52,13 +52,7 @@ // Required for definition of PL_UNUSED macro #include "plplotP.h" -#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 5 -// From (private) tclInt.h in tcl8.5 #define TclFormatInt( buf, n ) sprintf( ( buf ), "%ld", (long) ( n ) ) -#else -// From (private) tclIntDecls.h in tcl8.4 and before -EXTERN int TclFormatInt _ANSI_ARGS_( ( char * buffer, long n ) ); -#endif #ifndef TclObjCommandComplete_TCL_DECLARED EXTERN int TclObjCommandComplete _ANSI_ARGS_( ( Tcl_Obj * cmdPtr ) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |