Index: xotcl/ChangeLog =================================================================== diff -u -rd0042f1326f427aa395ed6e54d5690cb06d43c81 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/ChangeLog (.../ChangeLog) (revision d0042f1326f427aa395ed6e54d5690cb06d43c81) +++ xotcl/ChangeLog (.../ChangeLog) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -1,3 +1,11 @@ +2004-08-01 Gustaf.Neumann@wu-wien.ac.at + * yet another fixed access to freed memory (when the configure + method returned a non numerical value, which was tried to be + converted into a number; setting refcounts properly helped. + (thanks to Zoran for his help with Purify ) + * minor code cleanup + * test with tcl 8.4.7 + 2004-07-29 Gustaf.Neumann@wu-wien.ac.at * changes to forward and instforward: + %some-command executes some-command at invocation time and Index: xotcl/Makefile =================================================================== diff -u -r308ae099d8de5e6aee3e2baa61b8585c22660087 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/Makefile (.../Makefile) (revision 308ae099d8de5e6aee3e2baa61b8585c22660087) +++ xotcl/Makefile (.../Makefile) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile,v 1.13 2004/07/30 09:21:36 neumann Exp $ +# RCS: @(#) $Id: Makefile,v 1.14 2004/08/02 09:43:32 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that @@ -28,7 +28,7 @@ src_app_dir = ${srcdir}/apps src_generic_dir = ${srcdir}/generic PLATFORM_DIR = $(srcdir)/unix -TCL_LIB_SPEC = -L/home/neumann/tcl8.4.5/unix -ltcl8.4 +TCL_LIB_SPEC = -L/home/neumann/import/tcl8.4.7/unix -ltcl8.4 TK_LIB_SPEC = -L/usr/lib -ltk8.4 subdirs = library/store/XOTclSdbm/ library/store/XOTclGdbm/ library/xml/TclExpat-1.1/ @@ -133,11 +133,11 @@ SHLIB_CFLAGS = -fPIC SHLIB_LD = gcc -pipe -shared SHLIB_LD_FLAGS = -SHLIB_LD_LIBS = ${LIBS} -L/home/neumann/tcl8.4.5/unix -ltclstub8.4 -L/usr/lib -ltkstub8.4 +SHLIB_LD_LIBS = ${LIBS} -L/home/neumann/import/tcl8.4.7/unix -ltclstub8.4 -L/usr/lib -ltkstub8.4 STLIB_LD = ${AR} cr -TCL_DEFS = -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DPEEK_XCLOSEIM=1 -DHAVE_SYS_IOCTL_H=1 -TCL_BIN_DIR = /home/neumann/tcl8.4.5/unix -TCL_SRC_DIR = /home/neumann/tcl8.4.5 +TCL_DEFS = -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 +TCL_BIN_DIR = /home/neumann/tcl8.4.7/unix +TCL_SRC_DIR = /home/neumann/import/tcl8.4.7 # This is necessary for packages that use private Tcl headers #TCL_TOP_DIR_NATIVE = $(TCL_SRC_DIR) # Not used, but retained for reference of what libs Tcl required @@ -159,7 +159,7 @@ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TCLLIBPATH="$(top_builddir)" -TCLSH_PROG = /home/neumann/tcl8.4.5/unix/tclsh +TCLSH_PROG = /home/neumann/tcl8.4.7/unix/tclsh TCLSH = $(TCLSH_ENV) $(TCLSH_PROG) SHARED_BUILD = 1 @@ -587,7 +587,7 @@ @echo " setenv TCLLIBPATH \"$(TCLLIBPATH)\"" @echo " and" @if test "x$(XOTCLSH)" = "x" ; then \ - echo " /home/neumann/tcl8.4.5/unix/tclsh" ; \ + echo " /home/neumann/tcl8.4.7/unix/tclsh" ; \ echo " package require XOTcl; namespace import -force xotcl::*" ; \ echo " or" ; \ echo " put the 'package require' line into your ~/.tclshrc" ; \ Index: xotcl/apps/utils/xotclsh =================================================================== diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/apps/utils/xotclsh (.../xotclsh) (revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8) +++ xotcl/apps/utils/xotclsh (.../xotclsh) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -1,7 +1,7 @@ -#!/home/neumann/tcl8.4.5/unix/tclsh +#!/home/neumann/tcl8.4.7/unix/tclsh if {$argc == 0} { puts "Don't use [info script] as interactive shell! Use instead:" - puts " /home/neumann/tcl8.4.5/unix/tclsh" + puts " /home/neumann/tcl8.4.7/unix/tclsh" puts " package require XOTcl; namespace import ::xotcl::*" } else { package require XOTcl Index: xotcl/apps/utils/xowish =================================================================== diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/apps/utils/xowish (.../xowish) (revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8) +++ xotcl/apps/utils/xowish (.../xowish) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -1,5 +1,5 @@ #!@WISH_PROG@ -###!/home/neumann/tcl8.4.5/unix/tclsh +###!/home/neumann/tcl8.4.7/unix/tclsh ###package require Tk if {$argc == 0} { puts "Don't use [info script] as interactive shell! Use instead:" Index: xotcl/library/store/XOTclGdbm/Makefile =================================================================== diff -u -r308ae099d8de5e6aee3e2baa61b8585c22660087 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/library/store/XOTclGdbm/Makefile (.../Makefile) (revision 308ae099d8de5e6aee3e2baa61b8585c22660087) +++ xotcl/library/store/XOTclGdbm/Makefile (.../Makefile) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile,v 1.12 2004/07/30 09:21:36 neumann Exp $ +# RCS: @(#) $Id: Makefile,v 1.13 2004/08/02 09:43:32 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that @@ -111,9 +111,9 @@ SHLIB_LD_FLAGS = SHLIB_LD_LIBS = ${LIBS} -L/usr/lib -ltclstub8.4 STLIB_LD = ${AR} cr -TCL_DEFS = -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DPEEK_XCLOSEIM=1 -DHAVE_SYS_IOCTL_H=1 +TCL_DEFS = -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 TCL_BIN_DIR = /usr/lib -TCL_SRC_DIR = /home/neumann/tcl8.4.5 +TCL_SRC_DIR = /home/neumann/import/tcl8.4.7 # This is necessary for packages that use private Tcl headers #TCL_TOP_DIR_NATIVE = @TCL_TOP_DIR_NATIVE@ # Not used, but retained for reference of what libs Tcl required Index: xotcl/library/store/XOTclSdbm/Makefile =================================================================== diff -u -r308ae099d8de5e6aee3e2baa61b8585c22660087 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/library/store/XOTclSdbm/Makefile (.../Makefile) (revision 308ae099d8de5e6aee3e2baa61b8585c22660087) +++ xotcl/library/store/XOTclSdbm/Makefile (.../Makefile) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile,v 1.12 2004/07/30 09:21:36 neumann Exp $ +# RCS: @(#) $Id: Makefile,v 1.13 2004/08/02 09:43:32 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that @@ -111,9 +111,9 @@ SHLIB_LD_FLAGS = SHLIB_LD_LIBS = ${LIBS} -L/usr/lib -ltclstub8.4 STLIB_LD = ${AR} cr -TCL_DEFS = -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DPEEK_XCLOSEIM=1 -DHAVE_SYS_IOCTL_H=1 +TCL_DEFS = -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 TCL_BIN_DIR = /usr/lib -TCL_SRC_DIR = /home/neumann/tcl8.4.5 +TCL_SRC_DIR = /home/neumann/import/tcl8.4.7 # This is necessary for packages that use private Tcl headers #TCL_TOP_DIR_NATIVE = @TCL_TOP_DIR_NATIVE@ # Not used, but retained for reference of what libs Tcl required Index: xotcl/library/store/XOTclSdbm/hash.c =================================================================== diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/library/store/XOTclSdbm/hash.c (.../hash.c) (revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8) +++ xotcl/library/store/XOTclSdbm/hash.c (.../hash.c) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -18,7 +18,7 @@ long sdbm_hash(str, len) register char *str; -register int len; +register size_t len; { register unsigned long n = 0; Index: xotcl/library/store/XOTclSdbm/pair.c =================================================================== diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/library/store/XOTclSdbm/pair.c (.../pair.c) (revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8) +++ xotcl/library/store/XOTclSdbm/pair.c (.../pair.c) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -8,7 +8,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: pair.c,v 1.1 2004/05/23 22:50:39 neumann Exp $"; +static char rcsid[] = "$Id: pair.c,v 1.2 2004/08/02 09:43:32 neumann Exp $"; #endif #include "sdbm.h" @@ -23,7 +23,7 @@ /* * forward */ -static int seepair proto((char *, int, char *, int)); +static int seepair proto((char *, int, char *, size_t)); /* * page format: @@ -224,7 +224,7 @@ char *pag; register int n; register char *key; -register int siz; +register size_t siz; { register int i; register int off = PBLKSIZ; Index: xotcl/library/store/XOTclSdbm/sdbm.h =================================================================== diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/library/store/XOTclSdbm/sdbm.h (.../sdbm.h) (revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8) +++ xotcl/library/store/XOTclSdbm/sdbm.h (.../sdbm.h) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -4,6 +4,8 @@ * author: oz@nexus.yorku.ca * status: public domain. */ +#include + #define DBLKSIZ 4096 #define PBLKSIZ 1024 #define PAIRMAX 1008 /* arbitrary on PBLKSIZ-N */ @@ -44,7 +46,7 @@ typedef struct { char *dptr; - int dsize; + size_t dsize; } datum; extern datum nullitem; @@ -76,4 +78,4 @@ * other */ extern DBM *sdbm_prep proto((char *, char *, int, int)); -extern long sdbm_hash proto((char *, int)); +extern long sdbm_hash proto((char *, size_t)); Index: xotcl/library/store/XOTclSdbm/xotclsdbm.c =================================================================== diff -u -rf7894d9be99a8da3a04218abcdb9bd46b6d625c8 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/library/store/XOTclSdbm/xotclsdbm.c (.../xotclsdbm.c) (revision f7894d9be99a8da3a04218abcdb9bd46b6d625c8) +++ xotcl/library/store/XOTclSdbm/xotclsdbm.c (.../xotclsdbm.c) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -160,7 +160,7 @@ */ list = Tcl_NewListObj(0, NULL); do { - Tcl_ListObjAppendElement(in,list,Tcl_NewStringObj(key.dptr,key.dsize-1)); + Tcl_ListObjAppendElement(in,list,Tcl_NewStringObj(key.dptr,(int)(key.dsize-1))); key = sdbm_nextkey(db->db); } while (key.dptr); Tcl_SetObjResult(in, list); @@ -191,7 +191,7 @@ content = sdbm_fetch(db->db,key); if (content.dptr) { /* found */ - Tcl_Obj *r = Tcl_NewStringObj(content.dptr, content.dsize-1); + Tcl_Obj *r = Tcl_NewStringObj(content.dptr, (int)(content.dsize-1)); Tcl_SetObjResult(in, r); } else { /* key not found */ Index: xotcl/library/xml/TclExpat-1.1/Makefile =================================================================== diff -u -r308ae099d8de5e6aee3e2baa61b8585c22660087 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/library/xml/TclExpat-1.1/Makefile (.../Makefile) (revision 308ae099d8de5e6aee3e2baa61b8585c22660087) +++ xotcl/library/xml/TclExpat-1.1/Makefile (.../Makefile) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile,v 1.12 2004/07/30 09:21:36 neumann Exp $ +# RCS: @(#) $Id: Makefile,v 1.13 2004/08/02 09:43:32 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that @@ -111,9 +111,9 @@ SHLIB_LD_FLAGS = SHLIB_LD_LIBS = ${LIBS} -L/usr/lib -ltclstub8.4 STLIB_LD = ${AR} cr -TCL_DEFS = -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DPEEK_XCLOSEIM=1 -DHAVE_SYS_IOCTL_H=1 +TCL_DEFS = -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DHAVE_READDIR_R=1 -DPEEK_XCLOSEIM=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 TCL_BIN_DIR = /usr/lib -TCL_SRC_DIR = /home/neumann/tcl8.4.5 +TCL_SRC_DIR = /home/neumann/import/tcl8.4.7 # This is necessary for packages that use private Tcl headers #TCL_TOP_DIR_NATIVE = @TCL_TOP_DIR_NATIVE@ # Not used, but retained for reference of what libs Tcl required Index: xotcl/xotclConfig.sh =================================================================== diff -u -r0fb94b7893b3423b536af13fa081e7190e0ec0a2 -r900ba9665a79888f0561e2c4b8574c2e4a3dad8b --- xotcl/xotclConfig.sh (.../xotclConfig.sh) (revision 0fb94b7893b3423b536af13fa081e7190e0ec0a2) +++ xotcl/xotclConfig.sh (.../xotclConfig.sh) (revision 900ba9665a79888f0561e2c4b8574c2e4a3dad8b) @@ -65,5 +65,5 @@ XOTCL_UNSHARED_LIB_SUFFIX=1.2.1.a # the shell in whose installation dirs the xotcl package is installed -XOTCL_COMPATIBLE_TCLSH=/home/neumann/tcl8.4.5/unix/tclsh +XOTCL_COMPATIBLE_TCLSH=/home/neumann/tcl8.4.7/unix/tclsh