TIP#72 implementation. See ChangeLog for details.

This version builds clean on Solaris/SPARC, with GCC and CC, both with and
without threads and both in 32-bit and 64-bit mode.

1 files changed, 175 insertions, 117 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index d9526b7..421e289 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.114 2002/02/10 20:36:34 kennykb Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.115 2002/02/15 14:28:48 dkf Exp $
  */
 
 #ifndef _TCL
@@ -57,7 +57,6 @@ extern "C" {
  * tools/tcl.wse.in	(for windows installer)
  * tools/tclSplash.bmp	(not patchlevel)
  */
-
 #define TCL_MAJOR_VERSION   8
 #define TCL_MINOR_VERSION   4
 #define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
@@ -174,13 +173,14 @@ extern "C" {
  * this file.  Resource compilers don't like all the C stuff, like typedefs
  * and procedure declarations, that occur below.
  */
-
 #ifndef RESOURCE_INCLUDED
 
+
 #ifndef BUFSIZ
-#include <stdio.h>
+#   include <stdio.h>
 #endif
 
+
 /*
  * Definitions that allow Tcl functions with variable numbers of
  * arguments to be used with either varargs.h or stdarg.h.  TCL_VARARGS
@@ -190,27 +190,25 @@ extern "C" {
  * string for use in the function definition.  TCL_VARARGS_START
  * initializes the va_list data structure and returns the first argument.
  */
-
 #if defined(__STDC__) || defined(HAS_STDARG)
 #   include <stdarg.h>
-
 #   define TCL_VARARGS(type, name) (type name, ...)
 #   define TCL_VARARGS_DEF(type, name) (type name, ...)
 #   define TCL_VARARGS_START(type, name, list) (va_start(list, name), name)
 #else
 #   include <varargs.h>
-
 #   ifdef __cplusplus
-#	define TCL_VARARGS(type, name) (type name, ...)
-#	define TCL_VARARGS_DEF(type, name) (type va_alist, ...)
+#      define TCL_VARARGS(type, name) (type name, ...)
+#      define TCL_VARARGS_DEF(type, name) (type va_alist, ...)
 #   else
-#	define TCL_VARARGS(type, name) ()
-#	define TCL_VARARGS_DEF(type, name) (va_alist)
+#      define TCL_VARARGS(type, name) ()
+#      define TCL_VARARGS_DEF(type, name) (va_alist)
 #   endif
 #   define TCL_VARARGS_START(type, name, list) \
 	(va_start(list), va_arg(list, type))
 #endif
 
+
 /*
  * Macros used to declare a function to be exported by a DLL.
  * Used by Windows, maps to no-op declarations on non-Windows systems.
@@ -247,23 +245,22 @@ extern "C" {
  * storage class will be set to DLLEXPORT.  At the end of the header file, the
  * storage class will be reset to DLLIMPORT.
  */
-
 #undef TCL_STORAGE_CLASS
 #ifdef BUILD_tcl
-# define TCL_STORAGE_CLASS DLLEXPORT
+#   define TCL_STORAGE_CLASS DLLEXPORT
 #else
-# ifdef USE_TCL_STUBS
-#  define TCL_STORAGE_CLASS
-# else
-#  define TCL_STORAGE_CLASS DLLIMPORT
-# endif
+#   ifdef USE_TCL_STUBS
+#      define TCL_STORAGE_CLASS
+#   else
+#      define TCL_STORAGE_CLASS DLLIMPORT
+#   endif
 #endif
 
+
 /*
  * Definitions that allow this header file to be used either with or
  * without ANSI C features like function prototypes.
  */
-
 #undef _ANSI_ARGS_
 #undef CONST
 #ifndef INLINE
@@ -285,11 +282,12 @@ extern "C" {
 #   define CONST84 CONST
 #endif
 
+
 /*
  * Make sure EXTERN isn't defined elsewhere
  */
 #ifdef EXTERN
-#undef EXTERN
+#   undef EXTERN
 #endif /* EXTERN */
 
 #ifdef __cplusplus
@@ -298,57 +296,139 @@ extern "C" {
 #   define EXTERN extern TCL_STORAGE_CLASS
 #endif
 
+
 /*
  * Macro to use instead of "void" for arguments that must have
  * type "void *" in ANSI C;  maps them to type "char *" in
  * non-ANSI systems.
  */
 #ifndef __WIN32__
-#ifndef VOID
-#   ifdef __STDC__
-#       define VOID void
-#   else
-#       define VOID char
+#   ifndef VOID
+#      ifdef __STDC__
+#         define VOID void
+#      else
+#         define VOID char
+#      endif
 #   endif
-#endif
 #else /* __WIN32__ */
 /*
  * The following code is copied from winnt.h
  */
-#ifndef VOID
-#define VOID void
+#   ifndef VOID
+#      define VOID void
 typedef char CHAR;
 typedef short SHORT;
 typedef long LONG;
-#endif
+#   endif
 #endif /* __WIN32__ */
 
+
 /*
  * Miscellaneous declarations.
  */
-
 #ifndef NULL
-#define NULL 0
+#   define NULL 0
 #endif
 
 #ifndef _CLIENTDATA
 #   if defined(__STDC__) || defined(__cplusplus) || defined(__BORLANDC__)
-    typedef void *ClientData;
+typedef void *ClientData;
 #   else
-    typedef int *ClientData;
+typedef int *ClientData;
 #   endif /* __STDC__ */
-#define _CLIENTDATA
+#   define _CLIENTDATA
 #endif
 
+
+/*
+ * 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.)
+ *
+ * At the moment, this only works on Unix systems anyway...
+ *
+ * Also defines the following macros:
+ * TCL_WIDE_INT_IS_LONG - if wide ints are really longs (i.e. we're on
+ *	a real 64-bit system.)
+ * Tcl_WideAsLong - forgetful converter from wideInt to long.
+ * Tcl_LongAsWide - sign-extending converter from long to wideInt.
+ * Tcl_WideAsDouble - converter from wideInt to double.
+ * Tcl_DoubleAsWide - converter from double to wideInt.
+ *
+ * The following invariant should hold for any long value 'longVal':
+ *	longVal == Tcl_WideAsLong(Tcl_LongAsWide(longVal))
+ *
+ * Note on converting between Tcl_WideInt and strings.  This
+ * implementation (in tclObj.c) depends on the functions strtoull()
+ * and, where sprintf(...,"%lld",...) does not work, lltostr().
+ * Although strtoull() is fairly straight-forward, lltostr() is a most
+ * unusual function on Solaris8 (taking its operating buffer
+ * backwards) so any changes you make will need to be done
+ * cautiously...
+ */
+#if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG)
+#   ifdef __WIN32__
+#      define TCL_WIDE_INT_TYPE __int64
+#      ifdef __BORLANDC__
+typedef struct stati64 Tcl_StatBuf;
+#         define TCL_LL_MODIFIER	"L"
+#         define TCL_LL_MODIFIER_SIZE	1
+#      else /* __BORLANDC__ */
+typedef struct _stati64	Tcl_StatBuf;
+#         define TCL_LL_MODIFIER	"I64"
+#         define TCL_LL_MODIFIER_SIZE	3
+#      endif /* __BORLANDC__ */
+#   else /* __WIN32__ */
+/*
+ * Don't know what platform it is and configure hasn't been run!  Assume
+ * it has no long long...
+ */
+#      define TCL_WIDE_INT_IS_LONG	1
+#   endif /* __WIN32__ */
+#endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */
+#ifdef TCL_WIDE_INT_IS_LONG
+#   undef TCL_WIDE_INT_TYPE
+#   define TCL_WIDE_INT_TYPE	long
+#endif /* TCL_WIDE_INT_IS_LONG */
+
+typedef TCL_WIDE_INT_TYPE		Tcl_WideInt;
+typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
+
+#ifdef TCL_WIDE_INT_IS_LONG
+#   include <sys/types.h>
+typedef struct stat	Tcl_StatBuf;
+#   define Tcl_WideAsLong(val)		((long)(val))
+#   define Tcl_LongAsWide(val)		((long)(val))
+#   define Tcl_WideAsDouble(val)	((double)((long)(val)))
+#   define Tcl_DoubleAsWide(val)	((long)((double)(val)))
+#else /* TCL_WIDE_INT_IS_LONG */
+#   ifndef __WIN32__
+#      include <sys/types.h>
+#      ifdef HAVE_STRUCT_STAT64
+typedef struct stat64	Tcl_StatBuf;
+#      else
+typedef struct stat	Tcl_StatBuf;
+#      endif /* HAVE_STRUCT_STAT64 */
+#      define TCL_LL_MODIFIER		"ll"
+#      define TCL_LL_MODIFIER_SIZE	2
+#   endif /* !__WIN32__ */
+#   define Tcl_WideAsLong(val)		((long)((Tcl_WideInt)(val)))
+#   define Tcl_LongAsWide(val)		((Tcl_WideInt)((long)(val)))
+#   define Tcl_WideAsDouble(val)	((double)((Tcl_WideInt)(val)))
+#   define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
+#endif /* TCL_WIDE_INT_IS_LONG */
+
+
 /*
  * This flag controls whether binary compatability is maintained with
  * extensions built against a previous version of Tcl. This is true
  * by default.
  */
 #ifndef TCL_PRESERVE_BINARY_COMPATABILITY
-#define TCL_PRESERVE_BINARY_COMPATABILITY 1
+#   define TCL_PRESERVE_BINARY_COMPATABILITY 1
 #endif
-    
+
+
 /*
  * Data structures defined opaquely in this module. The definitions below
  * just provide dummy types. A few fields are made visible in Tcl_Interp
@@ -401,13 +481,13 @@ typedef struct Tcl_Trace_ *Tcl_Trace;
 typedef struct Tcl_Var_ *Tcl_Var;
 typedef struct Tcl_ChannelTypeVersion_ *Tcl_ChannelTypeVersion;
 
+
 /*
  * Definition of the interface to procedures implementing threads.
  * A procedure following this definition is given to each call of
  * 'Tcl_CreateThread' and will be called as the main fuction of
  * the new thread created by that call.
  */
-
 #ifdef MAC_TCL
 typedef pascal void *(Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
 #elif defined __WIN32__
@@ -434,12 +514,10 @@ typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
 #endif
 
 
-
 /*
  * Definition of values for default stacksize and the possible flags to be
  * given to Tcl_CreateThread.
  */
-
 #define TCL_THREAD_STACK_DEFAULT (0)    /* Use default size for stack */
 #define TCL_THREAD_NOFLAGS       (0000) /* Standard flags, default behaviour */
 #define TCL_THREAD_JOINABLE      (0001) /* Mark the thread as joinable */
@@ -447,7 +525,6 @@ typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
 /*
  * Flag values passed to Tcl_GetRegExpFromObj.
  */
-
 #define	TCL_REG_BASIC		000000	/* BREs (convenience) */
 #define	TCL_REG_EXTENDED	000001	/* EREs */
 #define	TCL_REG_ADVF		000002	/* advanced features in EREs */
@@ -467,7 +544,6 @@ typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
  * The following flag is experimental and only intended for use by Expect.  It
  * will probably go away in a later release.
  */
-
 #define TCL_REG_BOSONLY		002000	/* prepend \A to pattern so it only
 					 * matches at the beginning of the
 					 * string. */
@@ -475,7 +551,6 @@ typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
 /*
  * Flags values passed to Tcl_RegExpExecObj.
  */
-
 #define	TCL_REG_NOTBOL	0001	/* Beginning of string does not match ^.  */
 #define	TCL_REG_NOTEOL	0002	/* End of string does not match $. */
 
@@ -484,7 +559,6 @@ typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
  * relative to the start of the match string, not the beginning of the
  * entire string.
  */
-
 typedef struct Tcl_RegExpIndices {
     long start;		/* character offset of first character in match */
     long end;		/* character offset of first character after the
@@ -505,8 +579,8 @@ typedef struct Tcl_RegExpInfo {
  * Picky compilers complain if this typdef doesn't appear before the
  * struct's reference in tclDecls.h.
  */
-
-typedef struct stat *Tcl_Stat_;
+typedef Tcl_StatBuf *Tcl_Stat_;
+typedef struct stat *Tcl_OldStat_;
 
 /*
  * When a TCL command returns, the interpreter contains a result from the
@@ -528,7 +602,6 @@ typedef struct stat *Tcl_Stat_;
  * TCL_CONTINUE		Go on to the next iteration of the current loop;
  *			the interpreter's result is meaningless.
  */
-
 #define TCL_OK		0
 #define TCL_ERROR	1
 #define TCL_RETURN	2
@@ -540,22 +613,29 @@ typedef struct stat *Tcl_Stat_;
 /*
  * Flags to control what substitutions are performed by Tcl_SubstObj():
  */
-
 #define TCL_SUBST_COMMANDS	001
 #define TCL_SUBST_VARIABLES	002
 #define TCL_SUBST_BACKSLASHES	004
 #define TCL_SUBST_ALL		007
 
+
 /*
  * Argument descriptors for math function callbacks in expressions:
  */
-
-typedef enum {TCL_INT, TCL_DOUBLE, TCL_EITHER} Tcl_ValueType;
+typedef enum {
+    TCL_INT, TCL_DOUBLE, TCL_EITHER, TCL_WIDE_INT
+#ifdef TCL_WIDE_INT_IS_LONG
+    = TCL_INT
+#endif
+} Tcl_ValueType;
 typedef struct Tcl_Value {
     Tcl_ValueType type;		/* Indicates intValue or doubleValue is
 				 * valid, or both. */
     long intValue;		/* Integer value. */
     double doubleValue;		/* Double-precision floating value. */
+#ifndef TCL_WIDE_INT_IS_LONG
+    Tcl_WideInt wideValue;	/* Wide (min. 64-bit) integer value. */
+#endif
 } Tcl_Value;
 
 /*
@@ -563,9 +643,9 @@ typedef struct Tcl_Value {
  * reference to Tcl_Obj is encountered in the procedure types declared 
  * below.
  */
-
 struct Tcl_Obj;
 
+
 /*
  * Procedure types defined by Tcl:
  */
@@ -635,6 +715,7 @@ typedef void (Tcl_CreateFileHandlerProc) _ANSI_ARGS_((int fd, int mask,
 typedef void (Tcl_DeleteFileHandlerProc) _ANSI_ARGS_((int fd));
 typedef void (Tcl_MainLoopProc) _ANSI_ARGS_((void));
 
+
 /*
  * The following structure represents a type of object, which is a
  * particular internal representation for an object plus a set of
@@ -660,6 +741,7 @@ typedef struct Tcl_ObjType {
 				 * failure. */
 } Tcl_ObjType;
 
+
 /*
  * One of the following structures exists for each object in the Tcl
  * system. An object stores a value as either a string, some internal
@@ -689,6 +771,7 @@ typedef struct Tcl_Obj {
 	long longValue;		/*   - an long integer value */
 	double doubleValue;	/*   - a double-precision floating value */
 	VOID *otherValuePtr;	/*   - another, type-specific value */
+	Tcl_WideInt wideValue;	/*   - a long long value */
 	struct {		/*   - internal rep as two pointers */
 	    VOID *ptr1;
 	    VOID *ptr2;
@@ -696,6 +779,7 @@ typedef struct Tcl_Obj {
     } internalRep;
 } Tcl_Obj;
 
+
 /*
  * Macros to increment and decrement a Tcl_Obj's reference count, and to
  * test whether an object is shared (i.e. has reference count > 1).
@@ -706,7 +790,6 @@ typedef struct Tcl_Obj {
  * "obj" twice. This means that you should avoid calling it with an
  * expression that is expensive to compute or has side effects.
  */
-
 void		Tcl_IncrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
 void		Tcl_DecrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
 int		Tcl_IsShared _ANSI_ARGS_((Tcl_Obj *objPtr));
@@ -750,14 +833,16 @@ int		Tcl_IsShared _ANSI_ARGS_((Tcl_Obj *objPtr));
      Tcl_DbNewObj(__FILE__, __LINE__)
 #  define Tcl_NewStringObj(bytes, len) \
      Tcl_DbNewStringObj(bytes, len, __FILE__, __LINE__)
+#  define Tcl_NewWideIntObj(val) \
+     Tcl_DbNewWideIntObj(val, __FILE__, __LINE__)
 #endif /* TCL_MEM_DEBUG */
 
+
 /*
  * The following structure contains the state needed by
  * Tcl_SaveResult.  No-one outside of Tcl should access any of these
  * fields.  This structure is typically allocated on the stack.
  */
-
 typedef struct Tcl_SavedResult {
     char *result;
     Tcl_FreeProc *freeProc;
@@ -793,6 +878,7 @@ typedef struct Tcl_Namespace {
 				 * namespace. */
 } Tcl_Namespace;
 
+
 /*
  * The following structure represents a call frame, or activation record.
  * A call frame defines a naming context for a procedure call: its local
@@ -829,6 +915,7 @@ typedef struct Tcl_CallFrame {
     char* dummy10;
 } Tcl_CallFrame;
 
+
 /*
  * Information about commands that is returned by Tcl_GetCommandInfo and
  * passed to Tcl_SetCommandInfo. objProc is an objc/objv object-based
@@ -843,7 +930,7 @@ typedef struct Tcl_CallFrame {
  * does string-to-object or object-to-string argument conversions then
  * calls the other procedure.
  */
-     
+
 typedef struct Tcl_CmdInfo {
     int isNativeObjectProc;	 /* 1 if objProc was registered by a call to
 				  * Tcl_CreateObjCommand; 0 otherwise.
@@ -870,7 +957,6 @@ typedef struct Tcl_CmdInfo {
  * field that clients should use is the string field, accessible via the
  * macro Tcl_DStringValue.  
  */
-
 #define TCL_DSTRING_STATIC_SIZE 200
 typedef struct Tcl_DString {
     char *string;		/* Points to beginning of string:  either
@@ -893,7 +979,6 @@ typedef struct Tcl_DString {
  * be specified in the "tcl_precision" variable, and the number of
  * bytes of buffer space required by Tcl_PrintDouble.
  */
- 
 #define TCL_MAX_PREC 17
 #define TCL_DOUBLE_SPACE (TCL_MAX_PREC+10)
 
@@ -902,7 +987,6 @@ typedef struct Tcl_DString {
  * string representation of an integer in base 10 (assuming the existence
  * of 64-bit integers).
  */
-
 #define TCL_INTEGER_SPACE	24
 
 /*
@@ -910,14 +994,12 @@ typedef struct Tcl_DString {
  * output braces (careful!  if you change this flag be sure to change
  * the definitions at the front of tclUtil.c).
  */
-
 #define TCL_DONT_USE_BRACES	1
 
 /*
  * Flag that may be passed to Tcl_GetIndexFromObj to force it to disallow
  * abbreviated strings.
  */
-
 #define TCL_EXACT	1
 
 /*
@@ -925,7 +1007,6 @@ typedef struct Tcl_DString {
  * WARNING: these bit choices must not conflict with the bit choices
  * for evalFlag bits in tclInt.h!!
  */
-
 #define TCL_NO_EVAL		0x10000
 #define TCL_EVAL_GLOBAL		0x20000
 #define TCL_EVAL_DIRECT		0x40000
@@ -934,7 +1015,6 @@ typedef struct Tcl_DString {
  * Special freeProc values that may be passed to Tcl_SetResult (see
  * the man page for details):
  */
-
 #define TCL_VOLATILE	((Tcl_FreeProc *) 1)
 #define TCL_STATIC	((Tcl_FreeProc *) 0)
 #define TCL_DYNAMIC	((Tcl_FreeProc *) 3)
@@ -942,7 +1022,6 @@ typedef struct Tcl_DString {
 /*
  * Flag values passed to variable-related procedures.
  */
-
 #define TCL_GLOBAL_ONLY		 1
 #define TCL_NAMESPACE_ONLY	 2
 #define TCL_APPEND_VALUE	 4
@@ -979,28 +1058,28 @@ typedef struct Tcl_DString {
  *  flag)
  */
 #ifndef TCL_NO_DEPRECATED
-#define TCL_PARSE_PART1          0x400
+#   define TCL_PARSE_PART1      0x400
 #endif
 
 
 /*
  * Types for linked variables:
  */
-
 #define TCL_LINK_INT		1
 #define TCL_LINK_DOUBLE		2
 #define TCL_LINK_BOOLEAN	3
 #define TCL_LINK_STRING		4
+#define TCL_LINK_WIDE_INT	5
 #define TCL_LINK_READ_ONLY	0x80
 
+
 /*
  * Forward declarations of Tcl_HashTable and related types.
  */
-
 typedef struct Tcl_HashKeyType Tcl_HashKeyType;
 typedef struct Tcl_HashTable Tcl_HashTable;
 typedef struct Tcl_HashEntry Tcl_HashEntry;
-    
+
 typedef unsigned int (Tcl_HashKeyProc) _ANSI_ARGS_((Tcl_HashTable *tablePtr,
 	VOID *keyPtr));
 typedef int (Tcl_CompareHashKeysProc) _ANSI_ARGS_((VOID *keyPtr,
@@ -1017,7 +1096,7 @@ typedef void (Tcl_FreeHashEntryProc) _ANSI_ARGS_((Tcl_HashEntry *hPtr));
  * member has been removed and the space used to store the hash value.
  */
 #ifndef TCL_HASH_KEY_STORE_HASH
-#define TCL_HASH_KEY_STORE_HASH 1
+#   define TCL_HASH_KEY_STORE_HASH 1
 #endif
 
 /*
@@ -1072,7 +1151,7 @@ struct Tcl_HashEntry {
  *				N bits as the index into the table.
  */
 #define TCL_HASH_KEY_RANDOMIZE_HASH 0x1
-    
+
 /*
  * Structure definition for the methods associated with a hash table
  * key type.
@@ -1086,7 +1165,7 @@ struct Tcl_HashKeyType {
 				 */
 
     int flags;			/* Flags, see above for details. */
-    
+
     /* Calculates a hash value for the key. If this is NULL then the pointer
      * itself is used as a hash value.
      */
@@ -1115,7 +1194,7 @@ struct Tcl_HashKeyType {
      */
     Tcl_FreeHashEntryProc *freeEntryProc;
 };
-    
+
 /*
  * Structure definition for a hash table.  Must be in tcl.h so clients
  * can allocate space for these structures, but clients should never
@@ -1232,21 +1311,19 @@ typedef struct Tcl_HashSearch {
 	(*((tablePtr)->findProc))(tablePtr, key)
 #   define Tcl_CreateHashEntry(tablePtr, key, newPtr) \
 	(*((tablePtr)->createProc))(tablePtr, key, newPtr)
-#endif
-
-#if !TCL_PRESERVE_BINARY_COMPATABILITY
+#else /* !TCL_PRESERVE_BINARY_COMPATABILITY */
 /*
  * Macro to use new extended version of Tcl_InitHashTable.
  */
-#define Tcl_InitHashTable(tablePtr, keyType) \
+#   define Tcl_InitHashTable(tablePtr, keyType) \
 	Tcl_InitHashTableEx(tablePtr, keyType, NULL)
-#endif
+#endif /* TCL_PRESERVE_BINARY_COMPATABILITY */
+
 
 /*
  * Flag values to pass to Tcl_DoOneEvent to disable searches
  * for some kinds of events:
  */
-
 #define TCL_DONT_WAIT		(1<<1)
 #define TCL_WINDOW_EVENTS	(1<<2)
 #define TCL_FILE_EVENTS		(1<<3)
@@ -1263,7 +1340,6 @@ typedef struct Tcl_HashSearch {
  * a Tcl_Event header followed by additional information specific to that
  * event.
  */
-
 struct Tcl_Event {
     Tcl_EventProc *proc;	/* Procedure to call to service this event. */
     struct Tcl_Event *nextPtr;	/* Next in list of pending events, or NULL. */
@@ -1272,7 +1348,6 @@ struct Tcl_Event {
 /*
  * Positions to pass to Tcl_QueueEvent:
  */
-
 typedef enum {
     TCL_QUEUE_TAIL, TCL_QUEUE_HEAD, TCL_QUEUE_MARK
 } Tcl_QueuePosition;
@@ -1281,17 +1356,16 @@ typedef enum {
  * Values to pass to Tcl_SetServiceMode to specify the behavior of notifier
  * event routines.
  */
-
 #define TCL_SERVICE_NONE 0
 #define TCL_SERVICE_ALL 1
 
+
 /*
  * The following structure keeps is used to hold a time value, either as
  * an absolute time (the number of seconds from the epoch) or as an
  * elapsed time. On Unix systems the epoch is Midnight Jan 1, 1970 GMT.
  * On Macintosh systems the epoch is Midnight Jan 1, 1904 GMT.
  */
-
 typedef struct Tcl_Time {
     long sec;			/* Seconds. */
     long usec;			/* Microseconds. */
@@ -1300,11 +1374,11 @@ typedef struct Tcl_Time {
 typedef void (Tcl_SetTimerProc) _ANSI_ARGS_((Tcl_Time *timePtr));
 typedef int (Tcl_WaitForEventProc) _ANSI_ARGS_((Tcl_Time *timePtr));
 
+
 /*
  * Bits to pass to Tcl_CreateFileHandler and Tcl_CreateChannelHandler
  * to indicate what sorts of events are of interest:
  */
-
 #define TCL_READABLE	(1<<1)
 #define TCL_WRITABLE	(1<<2)
 #define TCL_EXCEPTION	(1<<3)
@@ -1314,7 +1388,6 @@ typedef int (Tcl_WaitForEventProc) _ANSI_ARGS_((Tcl_Time *timePtr));
  * disposition of the stdio handles.  TCL_STDIN, TCL_STDOUT, TCL_STDERR,
  * are also used in Tcl_GetStdChannel.
  */
-
 #define TCL_STDIN		(1<<1)	
 #define TCL_STDOUT		(1<<2)
 #define TCL_STDERR		(1<<3)
@@ -1324,7 +1397,6 @@ typedef int (Tcl_WaitForEventProc) _ANSI_ARGS_((Tcl_Time *timePtr));
  * Bits passed to Tcl_DriverClose2Proc to indicate which side of a channel
  * should be closed.
  */
-
 #define TCL_CLOSE_READ		(1<<1)
 #define TCL_CLOSE_WRITE	(1<<2)
 
@@ -1332,20 +1404,18 @@ typedef int (Tcl_WaitForEventProc) _ANSI_ARGS_((Tcl_Time *timePtr));
  * Value to use as the closeProc for a channel that supports the
  * close2Proc interface.
  */
-
 #define TCL_CLOSE2PROC	((Tcl_DriverCloseProc *)1)
 
 /*
  * Channel version tag.  This was introduced in 8.3.2/8.4.
  */
-
 #define TCL_CHANNEL_VERSION_1	((Tcl_ChannelTypeVersion) 0x1)
 #define TCL_CHANNEL_VERSION_2	((Tcl_ChannelTypeVersion) 0x2)
 
+
 /*
  * Typedefs for the various operations in a channel type:
  */
-
 typedef int	(Tcl_DriverBlockModeProc) _ANSI_ARGS_((
 		    ClientData instanceData, int mode));
 typedef int	(Tcl_DriverCloseProc) _ANSI_ARGS_((ClientData instanceData,
@@ -1356,8 +1426,8 @@ typedef int	(Tcl_DriverInputProc) _ANSI_ARGS_((ClientData instanceData,
 		    char *buf, int toRead, int *errorCodePtr));
 typedef int	(Tcl_DriverOutputProc) _ANSI_ARGS_((ClientData instanceData,
 		    CONST84 char *buf, int toWrite, int *errorCodePtr));
-typedef int	(Tcl_DriverSeekProc) _ANSI_ARGS_((ClientData instanceData,
-		    long offset, int mode, int *errorCodePtr));
+typedef Tcl_WideInt (Tcl_DriverSeekProc) _ANSI_ARGS_((ClientData instanceData,
+		    Tcl_WideInt offset, int mode, int *errorCodePtr));
 typedef int	(Tcl_DriverSetOptionProc) _ANSI_ARGS_((
 		    ClientData instanceData, Tcl_Interp *interp,
 	            CONST char *optionName, CONST char *value));
@@ -1374,12 +1444,12 @@ typedef int	(Tcl_DriverFlushProc) _ANSI_ARGS_((
 typedef int	(Tcl_DriverHandlerProc) _ANSI_ARGS_((
 		    ClientData instanceData, int interestMask));
 
+
 /*
  * The following declarations either map ckalloc and ckfree to
  * malloc and free, or they map them to procedures with all sorts
  * of debugging hooks defined in tclCkalloc.c.
  */
-
 #ifdef TCL_MEM_DEBUG
 
 #   define ckalloc(x) Tcl_DbCkalloc(x, __FILE__, __LINE__)
@@ -1395,7 +1465,6 @@ typedef int	(Tcl_DriverHandlerProc) _ANSI_ARGS_((
  * is using the same memory allocator both inside and outside of the
  * Tcl library.
  */
-
 #   define ckalloc(x) Tcl_Alloc(x)
 #   define ckfree(x) Tcl_Free(x)
 #   define ckrealloc(x,y) Tcl_Realloc(x,y)
@@ -1417,7 +1486,6 @@ typedef int	(Tcl_DriverHandlerProc) _ANSI_ARGS_((
  * It is recommend that the Tcl_Channel* functions are used to access
  * elements of this structure, instead of direct accessing.
  */
-
 typedef struct Tcl_ChannelType {
     char *typeName;			/* The name of the channel type in Tcl
                                          * commands. This storage is owned by
@@ -1464,7 +1532,6 @@ typedef struct Tcl_ChannelType {
  * set the channel into blocking or nonblocking mode. They are passed
  * as arguments to the blockModeProc procedure in the above structure.
  */
-
 #define TCL_MODE_BLOCKING 0		/* Put channel into blocking mode. */
 #define TCL_MODE_NONBLOCKING 1		/* Put channel into nonblocking
 					 * mode. */
@@ -1472,13 +1539,13 @@ typedef struct Tcl_ChannelType {
 /*
  * Enum for different types of file paths.
  */
-
 typedef enum Tcl_PathType {
     TCL_PATH_ABSOLUTE,
     TCL_PATH_RELATIVE,
     TCL_PATH_VOLUME_RELATIVE
 } Tcl_PathType;
 
+
 /* 
  * The following structure is used to pass glob type data amongst
  * the various glob routines and Tcl_FSMatchInDirectory.
@@ -1511,11 +1578,11 @@ typedef struct Tcl_GlobTypeData {
 #define TCL_GLOB_PERM_W			(1<<3)
 #define TCL_GLOB_PERM_X			(1<<4)
 
+
 /*
  * Typedefs for the various filesystem operations:
  */
-
-typedef int (Tcl_FSStatProc) _ANSI_ARGS_((Tcl_Obj *pathPtr, struct stat *buf));
+typedef int (Tcl_FSStatProc) _ANSI_ARGS_((Tcl_Obj *pathPtr, Tcl_StatBuf *buf));
 typedef int (Tcl_FSAccessProc) _ANSI_ARGS_((Tcl_Obj *pathPtr, int mode));
 typedef Tcl_Channel (Tcl_FSOpenFileChannelProc) 
 	_ANSI_ARGS_((Tcl_Interp *interp, Tcl_Obj *pathPtr, 
@@ -1526,7 +1593,7 @@ typedef int (Tcl_FSMatchInDirectoryProc) _ANSI_ARGS_((Tcl_Interp* interp,
 typedef Tcl_Obj* (Tcl_FSGetCwdProc) _ANSI_ARGS_((Tcl_Interp *interp));
 typedef int (Tcl_FSChdirProc) _ANSI_ARGS_((Tcl_Obj *pathPtr));
 typedef int (Tcl_FSLstatProc) _ANSI_ARGS_((Tcl_Obj *pathPtr, 
-					   struct stat *buf));
+					   Tcl_StatBuf *buf));
 typedef int (Tcl_FSCreateDirectoryProc) _ANSI_ARGS_((Tcl_Obj *pathPtr));
 typedef int (Tcl_FSDeleteFileProc) _ANSI_ARGS_((Tcl_Obj *pathPtr));
 typedef int (Tcl_FSCopyDirectoryProc) _ANSI_ARGS_((Tcl_Obj *srcPathPtr,
@@ -1586,7 +1653,6 @@ typedef struct Tcl_FSVersion_ *Tcl_FSVersion;
 /*
  * Filesystem version tag.  This was introduced in 8.4.
  */
-
 #define TCL_FILESYSTEM_VERSION_1	((Tcl_FSVersion) 0x1)
 
 /*
@@ -1774,11 +1840,11 @@ typedef struct Tcl_Filesystem {
 			     */
 } Tcl_Filesystem;
 
+
 /*
  * The following structure represents the Notifier functions that
  * you can override with the Tcl_SetNotifier call.
  */
-
 typedef struct Tcl_NotifierProcs {
     Tcl_SetTimerProc *setTimerProc;
     Tcl_WaitForEventProc *waitForEventProc;
@@ -1786,11 +1852,11 @@ typedef struct Tcl_NotifierProcs {
     Tcl_DeleteFileHandlerProc *deleteFileHandlerProc;
 } Tcl_NotifierProcs;
 
+
 /*
  * The following structure represents a user-defined encoding.  It collects
  * together all the functions that are used by the specific encoding.
  */
-
 typedef struct Tcl_EncodingType {
     CONST char *encodingName;	/* The name of the encoding, e.g.  "euc-jp".
 				 * This name is the unique key for this
@@ -1844,16 +1910,14 @@ typedef struct Tcl_EncodingType {
  *				in the destination buffer and then continue
  *				to sonvert the source.
  */
-
 #define TCL_ENCODING_START		0x01
 #define TCL_ENCODING_END		0x02
 #define TCL_ENCODING_STOPONERROR	0x04
 
+
 /*
- *----------------------------------------------------------------
- * The following data structures and declarations are for the new
- * Tcl parser.	This stuff should all move to tcl.h eventually.
- *----------------------------------------------------------------
+ * The following data structures and declarations are for the new Tcl
+ * parser.
  */
 
 /*
@@ -1861,7 +1925,6 @@ typedef struct Tcl_EncodingType {
  * variable reference, one of the following structures is created to
  * describe the token.
  */
-
 typedef struct Tcl_Token {
     int type;			/* Type of token, such as TCL_TOKEN_WORD;
 				 * see below for valid types. */
@@ -1947,7 +2010,6 @@ typedef struct Tcl_Token {
  *				operator's operands. NumComponents is
  *				always 0.
  */
-
 #define TCL_TOKEN_WORD		1
 #define TCL_TOKEN_SIMPLE_WORD	2
 #define TCL_TOKEN_TEXT		4
@@ -1962,7 +2024,6 @@ typedef struct Tcl_Token {
  * will be stored in the error field of the Tcl_Parse structure
  * defined below.
  */
-
 #define TCL_PARSE_SUCCESS		0
 #define TCL_PARSE_QUOTE_EXTRA		1
 #define TCL_PARSE_BRACE_EXTRA		2
@@ -1978,7 +2039,6 @@ typedef struct Tcl_Token {
  * A structure of the following type is filled in by Tcl_ParseCommand.
  * It describes a single command parsed from an input string.
  */
-
 #define NUM_STATIC_TOKENS 20
 
 typedef struct Tcl_Parse {
@@ -2068,41 +2128,40 @@ typedef struct Tcl_Parse {
  *				encoding.  This error is reported only if
  *				TCL_ENCODING_STOPONERROR was specified.
  */
-
 #define TCL_CONVERT_MULTIBYTE		-1
 #define TCL_CONVERT_SYNTAX		-2
 #define TCL_CONVERT_UNKNOWN		-3
 #define TCL_CONVERT_NOSPACE		-4
 
+
 /*
  * The maximum number of bytes that are necessary to represent a single
  * Unicode character in UTF-8.
  */
-
 #define TCL_UTF_MAX		3
 
 /*
  * This represents a Unicode character.  Any changes to this should
  * also be reflected in regcustom.h.
  */
-
 typedef unsigned short Tcl_UniChar;
 
+
 /*
  * Deprecated Tcl procedures:
  */
-
 #ifndef TCL_NO_DEPRECATED
-#define Tcl_EvalObj(interp,objPtr) Tcl_EvalObjEx((interp),(objPtr),0)
-#define Tcl_GlobalEvalObj(interp,objPtr) \
+#   define Tcl_EvalObj(interp,objPtr) \
+	Tcl_EvalObjEx((interp),(objPtr),0)
+#   define Tcl_GlobalEvalObj(interp,objPtr) \
 	Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
 #endif
 
+
 /*
  * These function have been renamed. The old names are deprecated, but we
  * define these macros for backwards compatibilty.
  */
-
 #define Tcl_Ckalloc Tcl_Alloc
 #define Tcl_Ckfree Tcl_Free
 #define Tcl_Ckrealloc Tcl_Realloc
@@ -2111,6 +2170,7 @@ typedef unsigned short Tcl_UniChar;
 #define panic Tcl_Panic
 #define panicVA Tcl_PanicVA
 
+
 /*
  * The following constant is used to test for older versions of Tcl
  * in the stubs tables.
@@ -2183,7 +2243,6 @@ EXTERN void Tcl_Main _ANSI_ARGS_((int argc, char **argv,
  * This function is not *implemented* by the tcl library, so the storage
  * class is neither DLLEXPORT nor DLLIMPORT
  */
-
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS
 
@@ -2197,9 +2256,8 @@ EXTERN int		Tcl_AppInit _ANSI_ARGS_((Tcl_Interp *interp));
 /*
  * end block for C++
  */
-    
 #ifdef __cplusplus
 }
 #endif
-    
+
 #endif /* _TCL */