diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/rege_dfa.c | 2 | ||||
| -rw-r--r-- | generic/regexec.c | 2 | ||||
| -rw-r--r-- | generic/regguts.h | 2 | ||||
| -rw-r--r-- | generic/tcl.h | 20 | ||||
| -rw-r--r-- | generic/tclCompExpr.c | 5 | ||||
| -rw-r--r-- | generic/tclIOUtil.c | 4 | ||||
| -rw-r--r-- | generic/tclInt.h | 6 | ||||
| -rw-r--r-- | generic/tclRegexp.c | 4 | ||||
| -rw-r--r-- | generic/tclVar.c | 8 |
9 files changed, 36 insertions, 17 deletions
diff --git a/generic/rege_dfa.c b/generic/rege_dfa.c index 313892c..bc391fd 100644 --- a/generic/rege_dfa.c +++ b/generic/rege_dfa.c @@ -561,7 +561,7 @@ chr *start; struct sset *ss; struct sset *p; struct arcp ap; - struct arcp lastap; + struct arcp lastap = {NULL, 0}; /* silence gcc 4 warning */ color co; ss = pickss(v, d, cp, start); diff --git a/generic/regexec.c b/generic/regexec.c index 41d49bd..3eb73d1 100644 --- a/generic/regexec.c +++ b/generic/regexec.c @@ -349,7 +349,7 @@ struct colormap *cm; { struct dfa *s; struct dfa *d; - chr *cold; + chr *cold = NULL; /* silence gcc 4 warning */ int ret; s = newdfa(v, &v->g->search, cm, &v->dfa1); diff --git a/generic/regguts.h b/generic/regguts.h index 36e5092..b6152f4 100644 --- a/generic/regguts.h +++ b/generic/regguts.h @@ -55,8 +55,10 @@ /* assertions */ #ifndef assert # ifndef REG_DEBUG +# ifndef NDEBUG # define NDEBUG /* no assertions */ # endif +# endif #include <assert.h> #endif diff --git a/generic/tcl.h b/generic/tcl.h index 51dba46..4c2d7ed 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.2.20 2005/11/16 22:05:26 dgp Exp $ + * RCS: @(#) $Id: tcl.h,v 1.153.2.21 2005/11/27 02:34:41 das Exp $ */ #ifndef _TCL @@ -46,7 +46,8 @@ extern "C" { * win/makefile.vc (not patchlevel) 2 LOC * README (sections 0 and 2) * mac/README (2 LOC, not patchlevel) - * macosx/Tcl.pbproj/project.pbxproj (not patchlevel) 2 LOC + * macosx/Tcl.pbproj/project.pbxproj (not patchlevel) 1 LOC + * macosx/Tcl.pbproj/default.pbxuser (not patchlevel) 1 LOC * win/README.binary (sections 0-4) * win/README (not patchlevel) (sections 0 and 2) * unix/tcl.spec (2 LOC Major/Minor, 1 LOC patch) @@ -328,6 +329,21 @@ typedef long LONG; #endif /* + * Darwin specifc configure overrides (to support fat compiles, where + * configure runs only once for multiple architectures): + */ + +#ifdef __APPLE__ +# ifdef __LP64__ +# undef TCL_WIDE_INT_TYPE +# define TCL_WIDE_INT_IS_LONG 1 +# else /* !__LP64__ */ +# define TCL_WIDE_INT_TYPE long long +# undef TCL_WIDE_INT_IS_LONG +# endif /* __LP64__ */ +#endif /* __APPLE__ */ + +/* * Define Tcl_WideInt to be a type that is (at least) 64-bits wide, * and define Tcl_WideUInt to be the unsigned variant of that type * (assuming that where we have one, we can have the other.) diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index 68e1e11..bedf35d 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.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: tclCompExpr.c,v 1.13.2.1 2005/08/03 22:23:35 dgp Exp $ + * RCS: @(#) $Id: tclCompExpr.c,v 1.13.2.2 2005/11/27 02:34:41 das Exp $ */ #include "tclInt.h" @@ -338,7 +338,8 @@ CompileSubExpr(exprTokenPtr, infoPtr, envPtr) CompileEnv *envPtr; /* Holds resulting instructions. */ { Tcl_Interp *interp = infoPtr->interp; - Tcl_Token *tokenPtr, *endPtr, *afterSubexprPtr; + Tcl_Token *tokenPtr, *endPtr = NULL; /* silence gcc 4 warning */ + Tcl_Token *afterSubexprPtr; OperatorDesc *opDescPtr; Tcl_HashEntry *hPtr; CONST char *operator; diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 50882ec..73f824d 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -17,7 +17,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.22 2005/10/05 04:27:38 hobbs Exp $ + * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.23 2005/11/27 02:34:41 das Exp $ */ #include "tclInt.h" @@ -4592,7 +4592,7 @@ static int FindSplitPos _ANSI_ARGS_((char *path, char *separator)); * Define the 'path' object type, which Tcl uses to represent * file paths internally. */ -Tcl_ObjType tclFsPathType = { +static Tcl_ObjType tclFsPathType = { "path", /* name */ FreeFsPathInternalRep, /* freeIntRepProc */ DupFsPathInternalRep, /* dupIntRepProc */ diff --git a/generic/tclInt.h b/generic/tclInt.h index 014ba06..64a6bbe 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.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: tclInt.h,v 1.118.2.20 2005/11/18 23:07:27 msofer Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.118.2.21 2005/11/27 02:34:41 das Exp $ */ #ifndef _TCLINT @@ -53,8 +53,8 @@ /* * Ensure WORDS_BIGENDIAN is defined correcly: - * Needs to happen here in addition to configure to work with - * fat compiles on Darwin (i.e. ppc and i386 at the same time). + * Needs to happen here in addition to configure to work with fat compiles on + * Darwin (where configure runs only once for multiple architectures). */ #ifdef HAVE_SYS_TYPES_H diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c index 3722278..276ea55 100644 --- a/generic/tclRegexp.c +++ b/generic/tclRegexp.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: tclRegexp.c,v 1.14 2002/01/17 03:03:12 dgp Exp $ + * RCS: @(#) $Id: tclRegexp.c,v 1.14.4.1 2005/11/27 02:34:41 das Exp $ */ #include "tclInt.h" @@ -105,7 +105,7 @@ static int SetRegexpFromAny _ANSI_ARGS_((Tcl_Interp *interp, * of the compiled form of the regular expression. */ -Tcl_ObjType tclRegexpType = { +static Tcl_ObjType tclRegexpType = { "regexp", /* name */ FreeRegexpInternalRep, /* freeIntRepProc */ DupRegexpInternalRep, /* dupIntRepProc */ diff --git a/generic/tclVar.c b/generic/tclVar.c index 5945bfb..c926e4e 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -15,7 +15,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclVar.c,v 1.69.2.10 2005/11/04 01:15:20 msofer Exp $ + * RCS: @(#) $Id: tclVar.c,v 1.69.2.11 2005/11/27 02:34:41 das Exp $ */ #include "tclInt.h" @@ -111,17 +111,17 @@ static Tcl_UpdateStringProc UpdateParsedVarName; * it is a scalar variable */ -Tcl_ObjType tclLocalVarNameType = { +static Tcl_ObjType tclLocalVarNameType = { "localVarName", FreeLocalVarName, DupLocalVarName, UpdateLocalVarName, NULL }; -Tcl_ObjType tclNsVarNameType = { +static Tcl_ObjType tclNsVarNameType = { "namespaceVarName", FreeNsVarName, DupNsVarName, NULL, NULL }; -Tcl_ObjType tclParsedVarNameType = { +static Tcl_ObjType tclParsedVarNameType = { "parsedVarName", FreeParsedVarName, DupParsedVarName, UpdateParsedVarName, NULL }; |