summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--generic/tcl.h5
-rw-r--r--win/tclWinPipe.c9
3 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9fbf31c..a73edb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2003-03-12 Don Porter <dgp@users.sourceforge.net>
+ * generic/tcl.h: Removed TCL_PREFIX_IDENT and TCL_DEBUG_IDENT
+ * win/tclWinPipe.c: from tcl.h -- they are not part of Tcl's
+ public interface. Put them in win/tclWinPipe.c where they are used.
+
* generic/tclCmdMZ.c (Tcl_SubstObj): Corrected and added test for
* tests/subst.test (subst-2.4): Tcl_SubstObj's incorrect
halting of substitution at the first \x00 byte. [Bug 685106]
diff --git a/generic/tcl.h b/generic/tcl.h
index c85a656..9a76328 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -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: tcl.h,v 1.153 2003/02/15 02:16:29 hobbs Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.153.2.1 2003/03/12 19:19:29 dgp Exp $
*/
#ifndef _TCL
@@ -61,9 +61,6 @@ extern "C" {
#define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE
#define TCL_RELEASE_SERIAL 2
-#define TCL_PREFIX_IDENT ""
-#define TCL_DEBUG_IDENT TCL_DBGX
-
#define TCL_VERSION "8.4"
#define TCL_PATCH_LEVEL "8.4.2"
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 319ce3e..9e5d7e0 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -9,9 +9,12 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinPipe.c,v 1.33 2003/01/28 11:03:53 mdejong Exp $
+ * RCS: @(#) $Id: tclWinPipe.c,v 1.33.2.1 2003/03/12 19:19:32 dgp Exp $
*/
+#define PREFIX_IDENT ""
+#define DEBUG_IDENT TCL_DBGX
+
#include "tclWinInt.h"
#include <fcntl.h>
@@ -1208,9 +1211,9 @@ TclpCreateProcess(
char *start,*end;
Tcl_DString pipeDll;
Tcl_DStringInit(&pipeDll);
- Tcl_DStringAppend(&pipeDll, TCL_PREFIX_IDENT "tclpip"
+ Tcl_DStringAppend(&pipeDll, PREFIX_IDENT "tclpip"
STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION)
- STRINGIFY(TCL_DEBUG_IDENT) ".dll ", -1);
+ STRINGIFY(DEBUG_IDENT) ".dll ", -1);
tclExePtr = Tcl_NewStringObj(TclpFindExecutable(""), -1);
start = Tcl_GetStringFromObj(tclExePtr, &i);
for (end = start + (i-1); end > start; end--) {