diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2004-03-19 18:33:51 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2004-03-19 18:33:51 (GMT) |
| commit | 2e5d5696ba21142b2af832196c9428971bc198c8 (patch) | |
| tree | ac851f22aa1fdc090d2c9af4d6bf279a072ab214 /generic | |
| parent | 5ae57fc1b695b72d90d0b098b8f514621ff7e3ed (diff) | |
| download | tcl-2e5d5696ba21142b2af832196c9428971bc198c8.zip tcl-2e5d5696ba21142b2af832196c9428971bc198c8.tar.gz tcl-2e5d5696ba21142b2af832196c9428971bc198c8.tar.bz2 | |
Made HEAD build on Windows VC++ again.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclIntDecls.h | 7 | ||||
| -rw-r--r-- | generic/tclMain.c | 4 | ||||
| -rw-r--r-- | generic/tclObj.c | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index a46e585..c92dfcc 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -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: tclIntDecls.h,v 1.59 2004/03/19 16:15:39 dkf Exp $ + * RCS: @(#) $Id: tclIntDecls.h,v 1.60 2004/03/19 18:33:52 kennykb Exp $ */ #ifndef _TCLINTDECLS @@ -19,6 +19,11 @@ #include "tclPort.h" +#ifdef BUILD_tcl +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif /* BUILD_tcl */ + /* * WARNING: This file is automatically generated by the tools/genStubs.tcl * script. Any modifications to the function declarations below should be made diff --git a/generic/tclMain.c b/generic/tclMain.c index b98a171..19cf5d5 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.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: tclMain.c,v 1.22 2004/03/17 18:14:14 das Exp $ + * RCS: @(#) $Id: tclMain.c,v 1.23 2004/03/19 18:33:52 kennykb Exp $ */ #include "tcl.h" @@ -25,7 +25,7 @@ * the Tcl source directory to make their own modified versions). */ -extern int isatty _ANSI_ARGS_((int fd)); +extern DLLIMPORT int isatty _ANSI_ARGS_((int fd)); static Tcl_Obj *tclStartupScriptPath = NULL; static Tcl_Obj *tclStartupScriptEncoding = NULL; diff --git a/generic/tclObj.c b/generic/tclObj.c index 8e21743..e2d6056 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.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: tclObj.c,v 1.54 2004/01/28 23:56:59 dkf Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.55 2004/03/19 18:33:52 kennykb Exp $ */ #include "tclInt.h" @@ -1592,6 +1592,8 @@ Tcl_GetDoubleFromObj(interp, objPtr, dblPtr) if (objPtr->typePtr == &tclDoubleType) { *dblPtr = objPtr->internalRep.doubleValue; return TCL_OK; + } else if ( objPtr->typePtr == &tclIntType ) { + *dblPtr = objPtr->internalRep.longValue; } result = SetDoubleFromAny(interp, objPtr); |