jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[tcl] Drop remnants of support for Tcl < 8

Browse source 
The documented minimum has been Tcl 8.0 since before the great
merge in 2002.
This commit is contained in:
Olly Betts 2022-01-21 15:54:06 +13:00
commit 5d0679668d
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/tcl/tclrun.swg
View file

@ -67,7 +67,7 @@
#define SWIG_GetConstant SWIG_GetConstantObj #define SWIG_GetConstant SWIG_GetConstantObj
#define SWIG_Tcl_GetConstant SWIG_Tcl_GetConstantObj #define SWIG_Tcl_GetConstant SWIG_Tcl_GetConstantObj
#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 5 #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5)
#define SWIG_TCL_HASHTABLE_INIT {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} #define SWIG_TCL_HASHTABLE_INIT {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#else #else
#define SWIG_TCL_HASHTABLE_INIT {0} #define SWIG_TCL_HASHTABLE_INIT {0}

10
Lib/tcl/tclsh.i
View file

@ -46,11 +46,7 @@ int Tcl_AppInit(Tcl_Interp *interp){
if (SWIG_init(interp) == TCL_ERROR) if (SWIG_init(interp) == TCL_ERROR)
return TCL_ERROR; return TCL_ERROR;
#if TCL_MAJOR_VERSION > 7 || TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION >= 5 Tcl_SetVar(interp, (char *) "tcl_rcFileName",SWIG_RcFileName,TCL_GLOBAL_ONLY);
Tcl_SetVar(interp, (char *) "tcl_rcFileName",SWIG_RcFileName,TCL_GLOBAL_ONLY);
#else
tcl_RcFileName = SWIG_RcFileName;
#endif
#ifdef SWIG_RcRsrcName #ifdef SWIG_RcRsrcName
Tcl_SetVar(interp, (char *) "tcl_rcRsrcName",SWIG_RcRsrcName,TCL_GLOBAL); Tcl_SetVar(interp, (char *) "tcl_rcRsrcName",SWIG_RcRsrcName,TCL_GLOBAL);
#endif #endif
@ -58,7 +54,6 @@ int Tcl_AppInit(Tcl_Interp *interp){
return TCL_OK; return TCL_OK;
} }
#if TCL_MAJOR_VERSION > 7 || TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION >= 4
int main(int argc, char **argv) { int main(int argc, char **argv) {
#ifdef MAC_TCL #ifdef MAC_TCL
char *newArgv[2]; char *newArgv[2];
@ -77,9 +72,6 @@ int main(int argc, char **argv) {
return(0); return(0);
} }
#else
extern int main();
#endif
%} %}

4
Lib/tcl/wish.i
View file

@ -104,11 +104,7 @@ int Tcl_AppInit(Tcl_Interp *interp)
* then no user-specific startup file will be run under any conditions. * then no user-specific startup file will be run under any conditions.
*/ */
#if TCL_MAJOR_VERSION >= 8 || TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION >= 5
Tcl_SetVar(interp, (char *) "tcl_rcFileName",SWIG_RcFileName,TCL_GLOBAL_ONLY); Tcl_SetVar(interp, (char *) "tcl_rcFileName",SWIG_RcFileName,TCL_GLOBAL_ONLY);
#else
tcl_RcFileName = SWIG_RcFileName;
#endif
/* For Macintosh might also want this */ /* For Macintosh might also want this */