From 0c1e2fd32193b13a516b2efbc1c5949057aacb5c Mon Sep 17 00:00:00 2001
From: stanton <stanton>
Date: Thu, 11 Mar 1999 02:49:33 +0000
Subject: * generic/tclAlloc.c: Changed TCL_NATIVE_MALLOC to USE_TCLALLOC so it
matches 8.1.
* generic/tclBasic.c:
* generic/tcl.h:
* generic/tcl.decls: Changed Tcl_ReleaseType from an enum to
macros so it can be used in .rc files.
Added Tcl_GetString.
* unix/Makefile.in: Added compat binaries to the stub library.
Changed compat binaries to always compile with shared flags since
they need to be shared for the stub library.
---
ChangeLog | 15 +++++++++++++++
generic/tcl.decls | 5 ++---
generic/tcl.h | 21 +++++++++------------
generic/tclAlloc.c | 8 ++++----
generic/tclBasic.c | 4 ++--
generic/tclDecls.h | 6 +++---
generic/tclStubs.c | 4 ++--
unix/Makefile.in | 33 ++++++++++++++++++---------------
8 files changed, 55 insertions(+), 41 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4254dc1..b372a39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1999-03-10 <stanton@GASPODE>
+
+ * generic/tclAlloc.c: Changed TCL_NATIVE_MALLOC to USE_TCLALLOC so
+ it matches 8.1.
+
+ * generic/tclBasic.c:
+ * generic/tcl.h:
+ * generic/tcl.decls: Changed Tcl_ReleaseType from an enum to
+ macros so it can be used in .rc files.
+ Added Tcl_GetString.
+
+ * unix/Makefile.in: Added compat binaries to the stub library.
+ Changed compat binaries to always compile with shared flags since
+ they need to be shared for the stub library.
+
1999-03-10 <redman@scriptics.com>
* generic/tcl.h:
diff --git a/generic/tcl.decls b/generic/tcl.decls
index d8e6941..11058d2 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -10,7 +10,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.decls,v 1.6 1999/03/11 00:19:23 stanton Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.7 1999/03/11 02:49:33 stanton Exp $
library tcl
@@ -958,8 +958,7 @@ declare 278 generic {
void panicVA(char *format, va_list argList)
}
declare 279 generic {
- void Tcl_GetVersion(int *major, int *minor, int *patchLevel, \
- Tcl_ReleaseType *type)
+ void Tcl_GetVersion(int *major, int *minor, int *patchLevel, int *type)
}
# Reserved for future use (8.0.x vs. 8.1)
# declare 280 generic {
diff --git a/generic/tcl.h b/generic/tcl.h
index 48869d1..d98a955 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -12,13 +12,21 @@
* 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.36 1999/03/10 22:55:51 redman Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.37 1999/03/11 02:49:33 stanton Exp $
*/
#ifndef _TCL
#define _TCL
/*
+ * The following defines are used to indicate the various release levels.
+ */
+
+#define TCL_ALPHA_RELEASE 0
+#define TCL_BETA_RELEASE 1
+#define TCL_FINAL_RELEASE 2
+
+/*
* When version numbers change here, must also go into the following files
* and update the version numbers:
*
@@ -33,13 +41,6 @@
*
*/
-
-typedef enum {
- TCL_ALPHA_RELEASE = 0,
- TCL_BETA_RELEASE = 1,
- TCL_FINAL_RELEASE = 2
-} Tcl_ReleaseType;
-
#define TCL_MAJOR_VERSION 8
#define TCL_MINOR_VERSION 0
#define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE
@@ -1101,10 +1102,6 @@ EXTERN char * Tcl_InitStubs _ANSI_ARGS_((Tcl_Interp *interp,
EXTERN void Tcl_InitMemory _ANSI_ARGS_((Tcl_Interp *interp));
EXTERN void Tcl_Main _ANSI_ARGS_((int argc, char **argv,
Tcl_AppInitProc *appInitProc));
-EXTERN void Tcl_GetVersion _ANSI_ARGS_((int *major,
- int *minor, int *patchLevel, Tcl_ReleaseType *type));
-
-
/*
* Convenience declaration of Tcl_AppInit for backwards compatibility.
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index f22efff..9314c2a 100644
--- a/generic/tclAlloc.c
+++ b/generic/tclAlloc.c
@@ -14,13 +14,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclAlloc.c,v 1.4 1999/03/10 05:52:46 stanton Exp $
+ * RCS: @(#) $Id: tclAlloc.c,v 1.5 1999/03/11 02:49:34 stanton Exp $
*/
#include "tclInt.h"
#include "tclPort.h"
-#ifndef USE_NATIVE_MALLOC
+#if USE_TCLALLOC
#ifdef TCL_DEBUG
# define DEBUG
@@ -457,7 +457,7 @@ mstats(
}
#endif
-#else /* USE_NATIVE_MALLOC */
+#else /* !USE_TCLALLOC */
/*
@@ -531,4 +531,4 @@ TclpRealloc(
return (char*) realloc(cp, nbytes);
}
-#endif /* USE_NATIVE_MALLOC */
+#endif /* !USE_TCLALLOC */
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 7a41b21..24c7189 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.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: tclBasic.c,v 1.17 1999/03/10 22:55:51 redman Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.18 1999/03/11 02:49:34 stanton Exp $
*/
#include "tclInt.h"
@@ -4176,7 +4176,7 @@ void Tcl_GetVersion(major, minor, patchLevel, type)
int *major;
int *minor;
int *patchLevel;
- Tcl_ReleaseType *type;
+ int *type;
{
if (major != NULL) {
*major = TCL_MAJOR_VERSION;
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 645ceea..70bdf2a 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclDecls.h,v 1.5 1999/03/10 23:45:51 redman Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.6 1999/03/11 02:49:34 stanton Exp $
*/
#ifndef _TCLDECLS
@@ -871,7 +871,7 @@ EXTERN Tcl_Pid Tcl_WaitPid _ANSI_ARGS_((Tcl_Pid pid, int * statPtr,
EXTERN void panicVA _ANSI_ARGS_((char * format, va_list argList));
/* 279 */
EXTERN void Tcl_GetVersion _ANSI_ARGS_((int * major, int * minor,
- int * patchLevel, Tcl_ReleaseType * type));
+ int * patchLevel, int * type));
typedef struct TclStubHooks {
struct TclPlatStubs *tclPlatStubs;
@@ -1186,7 +1186,7 @@ typedef struct TclStubs {
int (*tcl_VarEvalVA) _ANSI_ARGS_((Tcl_Interp * interp, va_list argList)); /* 276 */
Tcl_Pid (*tcl_WaitPid) _ANSI_ARGS_((Tcl_Pid pid, int * statPtr, int options)); /* 277 */
void (*panicVA) _ANSI_ARGS_((char * format, va_list argList)); /* 278 */
- void (*tcl_GetVersion) _ANSI_ARGS_((int * major, int * minor, int * patchLevel, Tcl_ReleaseType * type)); /* 279 */
+ void (*tcl_GetVersion) _ANSI_ARGS_((int * major, int * minor, int * patchLevel, int * type)); /* 279 */
} TclStubs;
extern TclStubs *tclStubsPtr;
diff --git a/generic/tclStubs.c b/generic/tclStubs.c
index 6bfd755..a1f11fc 100644
--- a/generic/tclStubs.c
+++ b/generic/tclStubs.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclStubs.c,v 1.5 1999/03/10 23:45:51 redman Exp $
+ * RCS: @(#) $Id: tclStubs.c,v 1.6 1999/03/11 02:49:34 stanton Exp $
*/
#include "tcl.h"
@@ -2701,7 +2701,7 @@ Tcl_GetVersion(major, minor, patchLevel, type)
int * major;
int * minor;
int * patchLevel;
- Tcl_ReleaseType * type;
+ int * type;
{
(tclStubsPtr->tcl_GetVersion)(major, minor, patchLevel, type);
}
diff --git a/unix/Makefile.in b/unix/Makefile.in
index d9f05ee..ec5d09c 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.18 1999/03/10 05:52:52 stanton Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.19 1999/03/11 02:49:35 stanton Exp $
# Current Tcl version; used in various names.
@@ -260,7 +260,7 @@ GENERIC_OBJS = regexp.o tclAlloc.o tclAsync.o tclBasic.o tclBinary.o \
tclStubInit.o tclTimer.o tclUtil.o tclVar.o
STUB_LIB_OBJS = tclIntPlatStubs.o tclIntStubs.o tclPlatStubs.o tclStubLib.o \
- tclStubs.o
+ tclStubs.o ${COMPAT_OBJS}
OBJS = ${GENERIC_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} ${COMPAT_OBJS} \
@DL_OBJS@
@@ -643,10 +643,10 @@ tclAppInit.o: $(UNIX_DIR)/tclAppInit.c
$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclAppInit.c
# On unix we want to use the normal malloc/free implementation, so we
-# specifically set the USE_NATIVE_MALLOC flag.
+# specifically set the USE_TCL_ALLOC flag.
tclAlloc.o: $(GENERIC_DIR)/tclAlloc.c
- $(CC) -c $(CC_SWITCHES) -DUSE_NATIVE_MALLOC $(GENERIC_DIR)/tclAlloc.c
+ $(CC) -c $(CC_SWITCHES) -DUSE_TCL_ALLOC=0 $(GENERIC_DIR)/tclAlloc.c
tclAsync.o: $(GENERIC_DIR)/tclAsync.c
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclAsync.c
@@ -851,37 +851,40 @@ tclUnixInit.o: $(UNIX_DIR)/tclUnixInit.c tclConfig.sh
-DTCL_PACKAGE_PATH="\"${TCL_PACKAGE_PATH}\"" \
$(UNIX_DIR)/tclUnixInit.c
-# compat binaries
+# compat binaries, these must be compiled for use in a shared library
+# even though they may be placed in a static executable or library. Since
+# they are included in both the tcl library and the stub library, they
+# need to be relocatable.
fixstrtod.o: $(COMPAT_DIR)/fixstrtod.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/fixstrtod.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/fixstrtod.c
getcwd.o: $(COMPAT_DIR)/getcwd.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/getcwd.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/getcwd.c
opendir.o: $(COMPAT_DIR)/opendir.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/opendir.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/opendir.c
strncasecmp.o: $(COMPAT_DIR)/strncasecmp.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/strncasecmp.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strncasecmp.c
strstr.o: $(COMPAT_DIR)/strstr.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/strstr.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strstr.c
strtod.o: $(COMPAT_DIR)/strtod.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/strtod.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strtod.c
strtol.o: $(COMPAT_DIR)/strtol.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/strtol.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strtol.c
strtoul.o: $(COMPAT_DIR)/strtoul.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/strtoul.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strtoul.c
tmpnam.o: $(COMPAT_DIR)/tmpnam.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/tmpnam.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/tmpnam.c
waitpid.o: $(COMPAT_DIR)/waitpid.c
- $(CC) -c $(CC_SWITCHES) $(COMPAT_DIR)/waitpid.c
+ $(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/waitpid.c
# Stub library binaries, these must be compiled for use in a shared library
--
cgit v0.12