diff options
| author | andreas_kupries <akupries@shaw.ca> | 2002-02-15 19:58:28 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2002-02-15 19:58:28 (GMT) |
| commit | 097b4b7f2e14a0d47f82c9d8b7579bee651660b4 (patch) | |
| tree | bc4839f43def6eadc8b2d9058b931dc569d662bf /generic | |
| parent | 66a15c6f8be47c3acbdddffadc67f50dec8a56e6 (diff) | |
| download | tcl-097b4b7f2e14a0d47f82c9d8b7579bee651660b4.zip tcl-097b4b7f2e14a0d47f82c9d8b7579bee651660b4.tar.gz tcl-097b4b7f2e14a0d47f82c9d8b7579bee651660b4.tar.bz2 | |
* tclExecute.c:
* tclIOGT.c:
* tclIndexObj.c: Touchups to the TIP 72 patch to make it
compileable under Windows again. The changes are not complete,
there is one nasty regarding _stati64
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclExecute.c | 4 | ||||
| -rw-r--r-- | generic/tclIOGT.c | 4 | ||||
| -rw-r--r-- | generic/tclIndexObj.c | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 546f000..21eb610 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -11,7 +11,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.47 2002/02/15 14:28:49 dkf Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.48 2002/02/15 19:58:28 andreas_kupries Exp $ */ #include "tclInt.h" @@ -5781,7 +5781,7 @@ ExprCallMathFunc(interp, eePtr, objc, objv) Tcl_WideInt w = valuePtr->internalRep.wideValue; if (mathFuncPtr->argTypes[k] == TCL_DOUBLE) { args[k].type = TCL_DOUBLE; - args[k].wideValue = Tcl_WideAsDouble(w); + args[k].wideValue = (Tcl_WideInt) Tcl_WideAsDouble(w); } else if (mathFuncPtr->argTypes[k] == TCL_INT) { args[k].type = TCL_INT; args[k].wideValue = Tcl_WideAsLong(w); diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c index c48ce18..022ba35 100644 --- a/generic/tclIOGT.c +++ b/generic/tclIOGT.c @@ -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. * - * CVS: $Id: tclIOGT.c,v 1.5 2002/02/15 14:28:49 dkf Exp $ + * CVS: $Id: tclIOGT.c,v 1.6 2002/02/15 19:58:28 andreas_kupries Exp $ */ #include "tclInt.h" @@ -850,7 +850,7 @@ TransformSeekProc (instanceData, offset, mode, errorCodePtr) int mode; /* How to move */ int* errorCodePtr; /* Location of error flag. */ { - int result; + Tcl_WideInt result; TransformChannelData* dataPtr = (TransformChannelData*) instanceData; Tcl_Channel parent = Tcl_GetStackedChannel(dataPtr->self); Tcl_ChannelType* parentType = Tcl_GetChannelType(parent); diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c index 4b5dfe4..eab6b96 100644 --- a/generic/tclIndexObj.c +++ b/generic/tclIndexObj.c @@ -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: tclIndexObj.c,v 1.13 2002/02/15 14:28:49 dkf Exp $ + * RCS: @(#) $Id: tclIndexObj.c,v 1.14 2002/02/15 19:58:28 andreas_kupries Exp $ */ #include "tclInt.h" @@ -63,6 +63,10 @@ typedef struct { #ifdef __sparc # define STRING_AT(table, offset, index) \ (*((CONST char * CONST *)(((char *)(table)) + ((offset) * (index))))) + +#elif defined (WIN32) +# define STRING_AT(table, offset, index) \ + (*((CONST char * CONST *)(((char *)(table)) + ((offset) * (index))))) #else # define STRING_AT(table, offset, index) \ (*((CONST char * CONST *)(((VOID *)(table)) + (ptrdiff_t)((offset) * (index))))) @@ -266,7 +270,7 @@ Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, objPtr->internalRep.otherValuePtr = (VOID *) indexRep; objPtr->typePtr = &tclIndexType; } - indexRep->tablePtr = tablePtr; + indexRep->tablePtr = (VOID*) tablePtr; indexRep->offset = offset; indexRep->index = index; |