summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--generic/tcl.decls8
-rw-r--r--generic/tcl.h4
-rw-r--r--generic/tclCkalloc.c24
-rw-r--r--generic/tclDecls.h11
5 files changed, 36 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 51f6849..f1c53bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-12-18 Donal K. Fellows <fellowsd@cs.man.ac.uk>
+
+ * generic/tcl.h (TCL_STUB_MAGIC): Added cast to force type to be
+ an int and get rid of a persistent and pointless warning with
+ SunPro compiler.
+
+ * generic/tclCkalloc.c (Tcl_AttemptDbCkalloc,Tcl_AttemptDbCkrealloc):
+ * generic/tcl.decls (Tcl_AttemptDbCkalloc,Tcl_AttemptDbCkrealloc):
+ Made the file parameters to these functions into CONST char *,
+ like they always should have been to match the other Tcl*Db* API
+ functions.
+
2001-12-17 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* Applied #219311 on behalf of Rolf Schroedter
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 722cc80..f8be2c2 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.66 2001/11/21 02:36:20 hobbs Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.67 2001/12/18 15:21:20 dkf Exp $
library tcl
@@ -1508,14 +1508,14 @@ declare 428 generic {
char * Tcl_AttemptAlloc(unsigned int size)
}
declare 429 generic {
- char * Tcl_AttemptDbCkalloc(unsigned int size, char *file, int line)
+ char * Tcl_AttemptDbCkalloc(unsigned int size, CONST char *file, int line)
}
declare 430 generic {
char * Tcl_AttemptRealloc(char *ptr, unsigned int size)
}
declare 431 generic {
- char * Tcl_AttemptDbCkrealloc(char *ptr, unsigned int size, char *file,
- int line)
+ char * Tcl_AttemptDbCkrealloc(char *ptr, unsigned int size,
+ CONST char *file, int line)
}
declare 432 generic {
int Tcl_AttemptSetObjLength(Tcl_Obj *objPtr, int length)
diff --git a/generic/tcl.h b/generic/tcl.h
index c7cb5f2..976be0c 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -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: tcl.h,v 1.106 2001/11/23 01:26:39 das Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.107 2001/12/18 15:21:20 dkf Exp $
*/
#ifndef _TCL
@@ -2112,7 +2112,7 @@ typedef unsigned short Tcl_UniChar;
* value since the stubs tables don't match.
*/
-#define TCL_STUB_MAGIC 0xFCA3BACF
+#define TCL_STUB_MAGIC ((int)0xFCA3BACF)
/*
* The following function is required to be defined in all stubs aware
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index a3f5e15..dac67d4 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -13,7 +13,7 @@
*
* This code contributed by Karl Lehenbauer and Mark Diekhans
*
- * RCS: @(#) $Id: tclCkalloc.c,v 1.12 2001/04/04 16:07:20 kennykb Exp $
+ * RCS: @(#) $Id: tclCkalloc.c,v 1.13 2001/12/18 15:21:20 dkf Exp $
*/
#include "tclInt.h"
@@ -449,7 +449,7 @@ Tcl_DbCkalloc(size, file, line)
char *
Tcl_AttemptDbCkalloc(size, file, line)
unsigned int size;
- char *file;
+ CONST char *file;
int line;
{
struct mem_header *result;
@@ -628,10 +628,10 @@ Tcl_DbCkfree(ptr, file, line)
*/
char *
Tcl_DbCkrealloc(ptr, size, file, line)
- char *ptr;
+ char *ptr;
unsigned int size;
- CONST char *file;
- int line;
+ CONST char *file;
+ int line;
{
char *new;
unsigned int copySize;
@@ -660,10 +660,10 @@ Tcl_DbCkrealloc(ptr, size, file, line)
char *
Tcl_AttemptDbCkrealloc(ptr, size, file, line)
- char *ptr;
+ char *ptr;
unsigned int size;
- char *file;
- int line;
+ CONST char *file;
+ int line;
{
char *new;
unsigned int copySize;
@@ -1036,7 +1036,7 @@ Tcl_AttemptAlloc (size)
char *
Tcl_AttemptDbCkalloc(size, file, line)
unsigned int size;
- char *file;
+ CONST char *file;
int line;
{
char *result;
@@ -1112,10 +1112,10 @@ Tcl_AttemptRealloc(ptr, size)
char *
Tcl_AttemptDbCkrealloc(ptr, size, file, line)
- char *ptr;
+ char *ptr;
unsigned int size;
- char *file;
- int line;
+ CONST char *file;
+ int line;
{
char *result;
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 0e67b7b..d727963 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.66 2001/11/21 02:36:20 hobbs Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.67 2001/12/18 15:21:20 dkf Exp $
*/
#ifndef _TCLDECLS
@@ -1345,13 +1345,14 @@ EXTERN void Tcl_UntraceCommand _ANSI_ARGS_((Tcl_Interp * interp,
EXTERN char * Tcl_AttemptAlloc _ANSI_ARGS_((unsigned int size));
/* 429 */
EXTERN char * Tcl_AttemptDbCkalloc _ANSI_ARGS_((unsigned int size,
- char * file, int line));
+ CONST char * file, int line));
/* 430 */
EXTERN char * Tcl_AttemptRealloc _ANSI_ARGS_((char * ptr,
unsigned int size));
/* 431 */
EXTERN char * Tcl_AttemptDbCkrealloc _ANSI_ARGS_((char * ptr,
- unsigned int size, char * file, int line));
+ unsigned int size, CONST char * file,
+ int line));
/* 432 */
EXTERN int Tcl_AttemptSetObjLength _ANSI_ARGS_((
Tcl_Obj * objPtr, int length));
@@ -1997,9 +1998,9 @@ typedef struct TclStubs {
int (*tcl_TraceCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, int flags, Tcl_CommandTraceProc * proc, ClientData clientData)); /* 426 */
void (*tcl_UntraceCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, int flags, Tcl_CommandTraceProc * proc, ClientData clientData)); /* 427 */
char * (*tcl_AttemptAlloc) _ANSI_ARGS_((unsigned int size)); /* 428 */
- char * (*tcl_AttemptDbCkalloc) _ANSI_ARGS_((unsigned int size, char * file, int line)); /* 429 */
+ char * (*tcl_AttemptDbCkalloc) _ANSI_ARGS_((unsigned int size, CONST char * file, int line)); /* 429 */
char * (*tcl_AttemptRealloc) _ANSI_ARGS_((char * ptr, unsigned int size)); /* 430 */
- char * (*tcl_AttemptDbCkrealloc) _ANSI_ARGS_((char * ptr, unsigned int size, char * file, int line)); /* 431 */
+ char * (*tcl_AttemptDbCkrealloc) _ANSI_ARGS_((char * ptr, unsigned int size, CONST char * file, int line)); /* 431 */
int (*tcl_AttemptSetObjLength) _ANSI_ARGS_((Tcl_Obj * objPtr, int length)); /* 432 */
Tcl_ThreadId (*tcl_GetChannelThread) _ANSI_ARGS_((Tcl_Channel channel)); /* 433 */
Tcl_UniChar * (*tcl_GetUnicodeFromObj) _ANSI_ARGS_((Tcl_Obj * objPtr, int * lengthPtr)); /* 434 */