diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tclBasic.c | 9 | ||||
| -rw-r--r-- | generic/tclExecute.c | 18 | ||||
| -rw-r--r-- | unix/Makefile.in | 28 |
4 files changed, 18 insertions, 43 deletions
@@ -1,3 +1,9 @@ +2007-09-05 Don Porter <dgp@users.sourceforge.net> + + * generic/tclBasic.c: Removed support for the unmaintained + * generic/tclExecute.c: -DTCL_GENERIC_ONLY configuration. [Bug 1264623] + * unix/Makefile.in: + 2007-09-04 Don Porter <dgp@users.sourceforge.net> * unix/Makefile.in: It's unreliable to count on the release diff --git a/generic/tclBasic.c b/generic/tclBasic.c index cea8816..3babbf9 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.266 2007/08/28 16:24:28 dgp Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.267 2007/09/05 21:31:01 dgp Exp $ */ #include "tclInt.h" @@ -186,7 +186,6 @@ static const CmdInfo builtInCmds[] = { * Commands in the UNIX core: */ -#ifndef TCL_GENERIC_ONLY {"after", Tcl_AfterObjCmd, NULL, 1}, {"cd", Tcl_CdObjCmd, NULL, 0}, {"file", Tcl_FileObjCmd, NULL, 0}, @@ -200,14 +199,12 @@ static const CmdInfo builtInCmds[] = { {"vwait", Tcl_VwaitObjCmd, NULL, 1}, {"exec", Tcl_ExecObjCmd, NULL, 0}, {"source", Tcl_SourceObjCmd, NULL, 0}, -#endif /* TCL_GENERIC_ONLY */ {NULL, NULL, NULL, 0} }; static const CmdInfo2 builtInCmds2[] = { {"fileevent", "::tcl::chan::event", Tcl_FileEventObjCmd, 1}, {"fcopy", "::tcl::chan::copy", Tcl_FcopyObjCmd, 1}, -#ifndef TCL_GENERIC_ONLY {"close", "::tcl::chan::close", Tcl_CloseObjCmd, 1}, {"eof", "::tcl::chan::eof", Tcl_EofObjCmd, 1}, {"fblocked", "::tcl::chan::blocked", Tcl_FblockedObjCmd, 1}, @@ -218,7 +215,6 @@ static const CmdInfo2 builtInCmds2[] = { {"read", "::tcl::chan::read", Tcl_ReadObjCmd, 1}, {"seek", "::tcl::chan::seek", Tcl_SeekObjCmd, 1}, {"tell", "::tcl::chan::tell", Tcl_TellObjCmd, 1}, -#endif /* TCL_GENERIC_ONLY */ {NULL, NULL, 0} }; @@ -705,10 +701,7 @@ Tcl_CreateInterp(void) */ TclInterpInit(interp); - -#ifndef TCL_GENERIC_ONLY TclSetupEnv(interp); -#endif /* * TIP #59: Make embedded configuration information diff --git a/generic/tclExecute.c b/generic/tclExecute.c index b2abf5b..52f70a3 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -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: tclExecute.c,v 1.328 2007/09/03 01:28:31 das Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.329 2007/09/05 21:31:02 dgp Exp $ */ #include "tclInt.h" @@ -34,22 +34,6 @@ #endif /* - * The stuff below is a bit of a hack so that this file can be used in - * environments that include no UNIX. - * TODO: Does this serve any purpose anymore? - */ - -#ifdef TCL_GENERIC_ONLY -# ifndef NO_FLOAT_H -# include <float.h> -# else /* NO_FLOAT_H */ -# ifndef NO_VALUES_H -# include <values.h> -# endif /* !NO_VALUES_H */ -# endif /* !NO_FLOAT_H */ -#endif /* !TCL_GENERIC_ONLY */ - -/* * A mask (should be 2**n-1) that is used to work out when the bytecode engine * should call Tcl_AsyncReady() to see whether there is a signal that needs * handling. diff --git a/unix/Makefile.in b/unix/Makefile.in index acab16e..298f457 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.216 2007/09/05 01:39:21 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.217 2007/09/05 21:31:06 dgp Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -118,20 +118,6 @@ PROTO_FLAGS = ENV_FLAGS = #ENV_FLAGS = -DTclSetEnv=setenv -DTcl_PutEnv=putenv -DTclUnsetEnv=unsetenv -# To compile for non-UNIX systems (so that only the non-UNIX-specific commands -# are available), reverse the comment characters on the following pairs of -# lines. In addition, you'll have to provide your own replacement for the -# "panic" procedure (see panic.c for what the current one does). -GENERIC_FLAGS = -#GENERIC_FLAGS = -DTCL_GENERIC_ONLY -UNIX_OBJS = tclUnixChan.o tclUnixEvent.o tclUnixFCmd.o \ - tclUnixFile.o tclUnixPipe.o tclUnixSock.o \ - tclUnixTime.o tclUnixInit.o tclUnixThrd.o \ - tclUnixCompat.o -#UNIX_OBJS = -NOTIFY_OBJS = tclUnixNotfy.o -#NOTIFY_OBJS = - # To enable memory debugging, call configure with --enable-symbols=mem # Warning: if you enable memory debugging, you must do it *everywhere*, # including all the code that calls Tcl, and you must use ckalloc and ckfree @@ -271,8 +257,7 @@ DDD = ddd STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR} -I${TOMMATH_DIR} \ -${AC_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} \ -${ENV_FLAGS} @EXTRA_CC_SWITCHES@ +${AC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS} @EXTRA_CC_SWITCHES@ CC_SWITCHES = $(STUB_CC_SWITCHES) ${NO_DEPRECATED_FLAGS} @@ -281,7 +266,7 @@ APP_CC_SWITCHES = $(CC_SWITCHES) @EXTRA_APP_CC_SWITCHES@ LIBS = @TCL_LIBS@ DEPEND_SWITCHES = ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \ -${AC_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} @EXTRA_CC_SWITCHES@ +${AC_FLAGS} ${PROTO_FLAGS} @EXTRA_CC_SWITCHES@ TCLSH_OBJS = tclAppInit.o @@ -332,6 +317,13 @@ STUB_LIB_OBJS = tclStubLib.o ${COMPAT_OBJS} MAC_OSX_OBJS = tclMacOSXBundle.o tclMacOSXFCmd.o tclMacOSXNotify.o +UNIX_OBJS = tclUnixChan.o tclUnixEvent.o tclUnixFCmd.o \ + tclUnixFile.o tclUnixPipe.o tclUnixSock.o \ + tclUnixTime.o tclUnixInit.o tclUnixThrd.o \ + tclUnixCompat.o + +NOTIFY_OBJS = tclUnixNotfy.o + OBJS = ${GENERIC_OBJS} ${TOMMATH_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} \ ${COMPAT_OBJS} @DL_OBJS@ @PLAT_OBJS@ |