tcl.h | tcl.h | |||
---|---|---|---|---|
skipping to change at line 61 | skipping to change at line 61 | |||
* win/README (not patchlevel) (sections 0 and 2) | * win/README (not patchlevel) (sections 0 and 2) | |||
* unix/tcl.spec (1 LOC patch) | * unix/tcl.spec (1 LOC patch) | |||
* tools/tcl.hpj.in (not patchlevel, for windows installer) | * tools/tcl.hpj.in (not patchlevel, for windows installer) | |||
* tools/tcl.wse.in (for windows installer) | * tools/tcl.wse.in (for windows installer) | |||
* tools/tclSplash.bmp (not patchlevel) | * tools/tclSplash.bmp (not patchlevel) | |||
*/ | */ | |||
#define TCL_MAJOR_VERSION 8 | #define TCL_MAJOR_VERSION 8 | |||
#define TCL_MINOR_VERSION 5 | #define TCL_MINOR_VERSION 5 | |||
#define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE | #define TCL_RELEASE_LEVEL TCL_FINAL_RELEASE | |||
#define TCL_RELEASE_SERIAL 11 | #define TCL_RELEASE_SERIAL 12 | |||
#define TCL_VERSION "8.5" | #define TCL_VERSION "8.5" | |||
#define TCL_PATCH_LEVEL "8.5.11" | #define TCL_PATCH_LEVEL "8.5.12" | |||
/* | /* | |||
* The following definitions set up the proper options for Windows compiler s. | * The following definitions set up the proper options for Windows compiler s. | |||
* We use this method because there is no autoconf equivalent. | * We use this method because there is no autoconf equivalent. | |||
*/ | */ | |||
#ifndef __WIN32__ | #ifndef __WIN32__ | |||
# if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) || defined (__BORLANDC__) || (defined(__WATCOMC__) && defined(__WINDOWS_386__)) | # if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) || defined (__BORLANDC__) || (defined(__WATCOMC__) && defined(__WINDOWS_386__)) | |||
# define __WIN32__ | # define __WIN32__ | |||
# ifndef WIN32 | # ifndef WIN32 | |||
skipping to change at line 355 | skipping to change at line 355 | |||
* | * | |||
* The following invariant should hold for any long value 'longVal': | * The following invariant should hold for any long value 'longVal': | |||
* longVal == Tcl_WideAsLong(Tcl_LongAsWide(longVal)) | * longVal == Tcl_WideAsLong(Tcl_LongAsWide(longVal)) | |||
* | * | |||
* Note on converting between Tcl_WideInt and strings. This implementation (in | * Note on converting between Tcl_WideInt and strings. This implementation (in | |||
* tclObj.c) depends on the function | * tclObj.c) depends on the function | |||
* sprintf(...,"%" TCL_LL_MODIFIER "d",...). | * sprintf(...,"%" TCL_LL_MODIFIER "d",...). | |||
*/ | */ | |||
#if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG) | #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG) | |||
# if defined(__WIN32__) && !defined(__CYGWIN__) | # if defined(__WIN32__) | |||
# define TCL_WIDE_INT_TYPE __int64 | # define TCL_WIDE_INT_TYPE __int64 | |||
# ifdef __BORLANDC__ | # ifdef __BORLANDC__ | |||
typedef struct stati64 Tcl_StatBuf; | ||||
# define TCL_LL_MODIFIER "L" | # define TCL_LL_MODIFIER "L" | |||
# else /* __BORLANDC__ */ | # else /* __BORLANDC__ */ | |||
# if defined(_WIN64) | ||||
typedef struct __stat64 Tcl_StatBuf; | ||||
# elif (defined(_MSC_VER) && (_MSC_VER < 1400)) | ||||
typedef struct _stati64 Tcl_StatBuf; | ||||
# else | ||||
typedef struct _stat32i64 Tcl_StatBuf; | ||||
# endif /* _MSC_VER < 1400 */ | ||||
# define TCL_LL_MODIFIER "I64" | # define TCL_LL_MODIFIER "I64" | |||
# endif /* __BORLANDC__ */ | # endif /* __BORLANDC__ */ | |||
# elif defined(__GNUC__) | # elif defined(__GNUC__) | |||
# define TCL_WIDE_INT_TYPE long long | # define TCL_WIDE_INT_TYPE long long | |||
# define TCL_LL_MODIFIER "ll" | # define TCL_LL_MODIFIER "ll" | |||
# if defined(__WIN32__) | ||||
typedef struct _stat32i64 Tcl_StatBuf; | ||||
# else | ||||
typedef struct stat Tcl_StatBuf; | ||||
# endif | ||||
# else /* ! __WIN32__ && ! __GNUC__ */ | # else /* ! __WIN32__ && ! __GNUC__ */ | |||
/* | /* | |||
* Don't know what platform it is and configure hasn't discovered what is | * Don't know what platform it is and configure hasn't discovered what is | |||
* going on for us. Try to guess... | * going on for us. Try to guess... | |||
*/ | */ | |||
# ifdef NO_LIMITS_H | # ifdef NO_LIMITS_H | |||
# error please define either TCL_WIDE_INT_TYPE or TCL_WIDE_INT_IS_LO NG | # error please define either TCL_WIDE_INT_TYPE or TCL_WIDE_INT_IS_LO NG | |||
# else /* !NO_LIMITS_H */ | # else /* !NO_LIMITS_H */ | |||
# include <limits.h> | # include <limits.h> | |||
# if (INT_MAX < LONG_MAX) | # if (INT_MAX < LONG_MAX) | |||
skipping to change at line 404 | skipping to change at line 391 | |||
#endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */ | #endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */ | |||
#ifdef TCL_WIDE_INT_IS_LONG | #ifdef TCL_WIDE_INT_IS_LONG | |||
# undef TCL_WIDE_INT_TYPE | # undef TCL_WIDE_INT_TYPE | |||
# define TCL_WIDE_INT_TYPE long | # define TCL_WIDE_INT_TYPE long | |||
#endif /* TCL_WIDE_INT_IS_LONG */ | #endif /* TCL_WIDE_INT_IS_LONG */ | |||
typedef TCL_WIDE_INT_TYPE Tcl_WideInt; | typedef TCL_WIDE_INT_TYPE Tcl_WideInt; | |||
typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; | typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; | |||
#ifdef TCL_WIDE_INT_IS_LONG | #ifdef TCL_WIDE_INT_IS_LONG | |||
typedef struct stat Tcl_StatBuf; | ||||
# define Tcl_WideAsLong(val) ((long)(val)) | # define Tcl_WideAsLong(val) ((long)(val)) | |||
# define Tcl_LongAsWide(val) ((long)(val)) | # define Tcl_LongAsWide(val) ((long)(val)) | |||
# define Tcl_WideAsDouble(val) ((double)((long)(val))) | # define Tcl_WideAsDouble(val) ((double)((long)(val))) | |||
# define Tcl_DoubleAsWide(val) ((long)((double)(val))) | # define Tcl_DoubleAsWide(val) ((long)((double)(val))) | |||
# ifndef TCL_LL_MODIFIER | # ifndef TCL_LL_MODIFIER | |||
# define TCL_LL_MODIFIER "l" | # define TCL_LL_MODIFIER "l" | |||
# endif /* !TCL_LL_MODIFIER */ | # endif /* !TCL_LL_MODIFIER */ | |||
#else /* TCL_WIDE_INT_IS_LONG */ | #else /* TCL_WIDE_INT_IS_LONG */ | |||
/* | /* | |||
* The next short section of defines are only done when not running on Wind ows | * The next short section of defines are only done when not running on Wind ows | |||
* or some other strange platform. | * or some other strange platform. | |||
*/ | */ | |||
# ifndef TCL_LL_MODIFIER | # ifndef TCL_LL_MODIFIER | |||
# 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 "ll" | |||
# endif /* !TCL_LL_MODIFIER */ | # endif /* !TCL_LL_MODIFIER */ | |||
# define Tcl_WideAsLong(val) ((long)((Tcl_WideInt)(val))) | # define Tcl_WideAsLong(val) ((long)((Tcl_WideInt)(val))) | |||
# define Tcl_LongAsWide(val) ((Tcl_WideInt)((long)(val))) | # define Tcl_LongAsWide(val) ((Tcl_WideInt)((long)(val))) | |||
# define Tcl_WideAsDouble(val) ((double)((Tcl_WideInt)(val))) | # define Tcl_WideAsDouble(val) ((double)((Tcl_WideInt)(val))) | |||
# define Tcl_DoubleAsWide(val) ((Tcl_WideInt)((double)(val))) | # define Tcl_DoubleAsWide(val) ((Tcl_WideInt)((double)(val))) | |||
#endif /* TCL_WIDE_INT_IS_LONG */ | #endif /* TCL_WIDE_INT_IS_LONG */ | |||
#if defined(__WIN32__) | ||||
# ifdef __BORLANDC__ | ||||
typedef struct stati64 Tcl_StatBuf; | ||||
# elif defined(_WIN64) | ||||
typedef struct __stat64 Tcl_StatBuf; | ||||
# elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIM E_T) | ||||
typedef struct _stati64 Tcl_StatBuf; | ||||
# else | ||||
typedef struct _stat32i64 Tcl_StatBuf; | ||||
# endif /* _MSC_VER < 1400 */ | ||||
#elif defined(__CYGWIN__) | ||||
typedef struct _stat32i64 { | ||||
dev_t st_dev; | ||||
unsigned short st_ino; | ||||
unsigned short st_mode; | ||||
short st_nlink; | ||||
short st_uid; | ||||
short st_gid; | ||||
/* Here is a 2-byte gap */ | ||||
dev_t st_rdev; | ||||
/* Here is a 4-byte gap */ | ||||
long long st_size; | ||||
struct {long tv_sec;} st_atim; | ||||
struct {long tv_sec;} st_mtim; | ||||
struct {long tv_sec;} st_ctim; | ||||
/* Here is a 4-byte gap */ | ||||
} Tcl_StatBuf; | ||||
#elif defined(HAVE_STRUCT_STAT64) | ||||
typedef struct stat64 Tcl_StatBuf; | ||||
#else | ||||
typedef struct stat Tcl_StatBuf; | ||||
#endif | ||||
/* | /* | |||
* Data structures defined opaquely in this module. The definitions below j ust | * Data structures defined opaquely in this module. The definitions below j ust | |||
* provide dummy types. A few fields are made visible in Tcl_Interp | * provide dummy types. A few fields are made visible in Tcl_Interp | |||
* structures, namely those used for returning a string result from command s. | * structures, namely those used for returning a string result from command s. | |||
* Direct access to the result field is discouraged in Tcl 8.0. The | * Direct access to the result field is discouraged in Tcl 8.0. The | |||
* interpreter result is either an object or a string, and the two values a re | * interpreter result is either an object or a string, and the two values a re | |||
* kept consistent unless some C code sets interp->result directly. | * kept consistent unless some C code sets interp->result directly. | |||
* Programmers should use either the function Tcl_GetObjResult() or | * Programmers should use either the function Tcl_GetObjResult() or | |||
* Tcl_GetStringResult() to read the interpreter's result. See the SetResul t | * Tcl_GetStringResult() to read the interpreter's result. See the SetResul t | |||
* man page for details. | * man page for details. | |||
End of changes. 9 change blocks. | ||||
22 lines changed or deleted | 35 lines changed or added | |||
tclDecls.h | tclDecls.h | |||
---|---|---|---|---|
skipping to change at line 81 | skipping to change at line 81 | |||
#endif | #endif | |||
#ifndef Tcl_DbCkalloc_TCL_DECLARED | #ifndef Tcl_DbCkalloc_TCL_DECLARED | |||
#define Tcl_DbCkalloc_TCL_DECLARED | #define Tcl_DbCkalloc_TCL_DECLARED | |||
/* 6 */ | /* 6 */ | |||
EXTERN char * Tcl_DbCkalloc(unsigned int size, CONST char *file, | EXTERN char * Tcl_DbCkalloc(unsigned int size, CONST char *file, | |||
int line); | int line); | |||
#endif | #endif | |||
#ifndef Tcl_DbCkfree_TCL_DECLARED | #ifndef Tcl_DbCkfree_TCL_DECLARED | |||
#define Tcl_DbCkfree_TCL_DECLARED | #define Tcl_DbCkfree_TCL_DECLARED | |||
/* 7 */ | /* 7 */ | |||
EXTERN int Tcl_DbCkfree(char *ptr, CONST char *file, int line); | EXTERN void Tcl_DbCkfree(char *ptr, CONST char *file, int line); | |||
#endif | #endif | |||
#ifndef Tcl_DbCkrealloc_TCL_DECLARED | #ifndef Tcl_DbCkrealloc_TCL_DECLARED | |||
#define Tcl_DbCkrealloc_TCL_DECLARED | #define Tcl_DbCkrealloc_TCL_DECLARED | |||
/* 8 */ | /* 8 */ | |||
EXTERN char * Tcl_DbCkrealloc(char *ptr, unsigned int size, | EXTERN char * Tcl_DbCkrealloc(char *ptr, unsigned int size, | |||
CONST char *file, int line); | CONST char *file, int line); | |||
#endif | #endif | |||
#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | |||
#ifndef Tcl_CreateFileHandler_TCL_DECLARED | #ifndef Tcl_CreateFileHandler_TCL_DECLARED | |||
#define Tcl_CreateFileHandler_TCL_DECLARED | #define Tcl_CreateFileHandler_TCL_DECLARED | |||
skipping to change at line 3429 | skipping to change at line 3429 | |||
int magic; | int magic; | |||
struct TclStubHooks *hooks; | struct TclStubHooks *hooks; | |||
int (*tcl_PkgProvideEx) (Tcl_Interp *interp, CONST char *name, CONST ch ar *version, ClientData clientData); /* 0 */ | int (*tcl_PkgProvideEx) (Tcl_Interp *interp, CONST char *name, CONST ch ar *version, ClientData clientData); /* 0 */ | |||
CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, CONST ch ar *name, CONST char *version, int exact, ClientData *clientDataPtr); /* 1 */ | CONST84_RETURN char * (*tcl_PkgRequireEx) (Tcl_Interp *interp, CONST ch ar *name, CONST char *version, int exact, ClientData *clientDataPtr); /* 1 */ | |||
void (*tcl_Panic) (CONST char *format, ...); /* 2 */ | void (*tcl_Panic) (CONST char *format, ...); /* 2 */ | |||
char * (*tcl_Alloc) (unsigned int size); /* 3 */ | char * (*tcl_Alloc) (unsigned int size); /* 3 */ | |||
void (*tcl_Free) (char *ptr); /* 4 */ | void (*tcl_Free) (char *ptr); /* 4 */ | |||
char * (*tcl_Realloc) (char *ptr, unsigned int size); /* 5 */ | char * (*tcl_Realloc) (char *ptr, unsigned int size); /* 5 */ | |||
char * (*tcl_DbCkalloc) (unsigned int size, CONST char *file, int line) ; /* 6 */ | char * (*tcl_DbCkalloc) (unsigned int size, CONST char *file, int line) ; /* 6 */ | |||
int (*tcl_DbCkfree) (char *ptr, CONST char *file, int line); /* 7 */ | void (*tcl_DbCkfree) (char *ptr, CONST char *file, int line); /* 7 */ | |||
char * (*tcl_DbCkrealloc) (char *ptr, unsigned int size, CONST char *fi le, int line); /* 8 */ | char * (*tcl_DbCkrealloc) (char *ptr, unsigned int size, CONST char *fi le, int line); /* 8 */ | |||
#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | |||
void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, Cl ientData clientData); /* 9 */ | void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, Cl ientData clientData); /* 9 */ | |||
#endif /* UNIX */ | #endif /* UNIX */ | |||
#ifdef __WIN32__ /* WIN */ | #if defined(__WIN32__) /* WIN */ | |||
VOID *reserved9; | VOID *reserved9; | |||
#endif /* WIN */ | #endif /* WIN */ | |||
#ifdef MAC_OSX_TCL /* MACOSX */ | #ifdef MAC_OSX_TCL /* MACOSX */ | |||
void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, Cl ientData clientData); /* 9 */ | void (*tcl_CreateFileHandler) (int fd, int mask, Tcl_FileProc *proc, Cl ientData clientData); /* 9 */ | |||
#endif /* MACOSX */ | #endif /* MACOSX */ | |||
#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | |||
void (*tcl_DeleteFileHandler) (int fd); /* 10 */ | void (*tcl_DeleteFileHandler) (int fd); /* 10 */ | |||
#endif /* UNIX */ | #endif /* UNIX */ | |||
#ifdef __WIN32__ /* WIN */ | #if defined(__WIN32__) /* WIN */ | |||
VOID *reserved10; | VOID *reserved10; | |||
#endif /* WIN */ | #endif /* WIN */ | |||
#ifdef MAC_OSX_TCL /* MACOSX */ | #ifdef MAC_OSX_TCL /* MACOSX */ | |||
void (*tcl_DeleteFileHandler) (int fd); /* 10 */ | void (*tcl_DeleteFileHandler) (int fd); /* 10 */ | |||
#endif /* MACOSX */ | #endif /* MACOSX */ | |||
void (*tcl_SetTimer) (Tcl_Time *timePtr); /* 11 */ | void (*tcl_SetTimer) (Tcl_Time *timePtr); /* 11 */ | |||
void (*tcl_Sleep) (int ms); /* 12 */ | void (*tcl_Sleep) (int ms); /* 12 */ | |||
int (*tcl_WaitForEvent) (Tcl_Time *timePtr); /* 13 */ | int (*tcl_WaitForEvent) (Tcl_Time *timePtr); /* 13 */ | |||
int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 14 */ | int (*tcl_AppendAllObjTypes) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 14 */ | |||
void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */ | void (*tcl_AppendStringsToObj) (Tcl_Obj *objPtr, ...); /* 15 */ | |||
skipping to change at line 3608 | skipping to change at line 3608 | |||
CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Co mmand command); /* 160 */ | CONST84_RETURN char * (*tcl_GetCommandName) (Tcl_Interp *interp, Tcl_Co mmand command); /* 160 */ | |||
int (*tcl_GetErrno) (void); /* 161 */ | int (*tcl_GetErrno) (void); /* 161 */ | |||
CONST84_RETURN char * (*tcl_GetHostName) (void); /* 162 */ | CONST84_RETURN char * (*tcl_GetHostName) (void); /* 162 */ | |||
int (*tcl_GetInterpPath) (Tcl_Interp *askInterp, Tcl_Interp *slaveInter p); /* 163 */ | int (*tcl_GetInterpPath) (Tcl_Interp *askInterp, Tcl_Interp *slaveInter p); /* 163 */ | |||
Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp *interp); /* 164 */ | Tcl_Interp * (*tcl_GetMaster) (Tcl_Interp *interp); /* 164 */ | |||
CONST char * (*tcl_GetNameOfExecutable) (void); /* 165 */ | CONST char * (*tcl_GetNameOfExecutable) (void); /* 165 */ | |||
Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */ | Tcl_Obj * (*tcl_GetObjResult) (Tcl_Interp *interp); /* 166 */ | |||
#if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | #if !defined(__WIN32__) && !defined(MAC_OSX_TCL) /* UNIX */ | |||
int (*tcl_GetOpenFile) (Tcl_Interp *interp, CONST char *chanID, int for Writing, int checkUsage, ClientData *filePtr); /* 167 */ | int (*tcl_GetOpenFile) (Tcl_Interp *interp, CONST char *chanID, int for Writing, int checkUsage, ClientData *filePtr); /* 167 */ | |||
#endif /* UNIX */ | #endif /* UNIX */ | |||
#ifdef __WIN32__ /* WIN */ | #if defined(__WIN32__) /* WIN */ | |||
VOID *reserved167; | VOID *reserved167; | |||
#endif /* WIN */ | #endif /* WIN */ | |||
#ifdef MAC_OSX_TCL /* MACOSX */ | #ifdef MAC_OSX_TCL /* MACOSX */ | |||
int (*tcl_GetOpenFile) (Tcl_Interp *interp, CONST char *chanID, int for Writing, int checkUsage, ClientData *filePtr); /* 167 */ | int (*tcl_GetOpenFile) (Tcl_Interp *interp, CONST char *chanID, int for Writing, int checkUsage, ClientData *filePtr); /* 167 */ | |||
#endif /* MACOSX */ | #endif /* MACOSX */ | |||
Tcl_PathType (*tcl_GetPathType) (CONST char *path); /* 168 */ | Tcl_PathType (*tcl_GetPathType) (CONST char *path); /* 168 */ | |||
int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */ | int (*tcl_Gets) (Tcl_Channel chan, Tcl_DString *dsPtr); /* 169 */ | |||
int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */ | int (*tcl_GetsObj) (Tcl_Channel chan, Tcl_Obj *objPtr); /* 170 */ | |||
int (*tcl_GetServiceMode) (void); /* 171 */ | int (*tcl_GetServiceMode) (void); /* 171 */ | |||
Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp *interp, CONST char *slaveName ); /* 172 */ | Tcl_Interp * (*tcl_GetSlave) (Tcl_Interp *interp, CONST char *slaveName ); /* 172 */ | |||
End of changes. 5 change blocks. | ||||
5 lines changed or deleted | 5 lines changed or added | |||
tclPlatDecls.h | tclPlatDecls.h | |||
---|---|---|---|---|
skipping to change at line 25 | skipping to change at line 25 | |||
# define TCL_STORAGE_CLASS DLLEXPORT | # define TCL_STORAGE_CLASS DLLEXPORT | |||
#else | #else | |||
# ifdef USE_TCL_STUBS | # ifdef USE_TCL_STUBS | |||
# define TCL_STORAGE_CLASS | # define TCL_STORAGE_CLASS | |||
# else | # else | |||
# define TCL_STORAGE_CLASS DLLIMPORT | # define TCL_STORAGE_CLASS DLLIMPORT | |||
# endif | # endif | |||
#endif | #endif | |||
/* | /* | |||
* Pull in the typedef of TCHAR for windows. | * TCHAR is needed here for win32, so if it is not defined yet do it here. | |||
* This way, we don't need to include <tchar.h> just for one define. | ||||
*/ | */ | |||
#if defined(__WIN32__) && !defined(_TCHAR_DEFINED) | #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(_TCHAR_DEFINED) | |||
# include <tchar.h> | # if defined(_UNICODE) | |||
# ifndef _TCHAR_DEFINED | typedef wchar_t TCHAR; | |||
/* Borland seems to forget to set this. */ | # else | |||
typedef _TCHAR TCHAR; | typedef char TCHAR; | |||
# define _TCHAR_DEFINED | ||||
# endif | ||||
# if defined(_MSC_VER) && defined(__STDC__) | ||||
/* VS2005 SP1 misses this. See [Bug #3110161] */ | ||||
typedef _TCHAR TCHAR; | ||||
# endif | # endif | |||
# define _TCHAR_DEFINED | ||||
#endif | #endif | |||
/* !BEGIN!: Do not edit below this line. */ | /* !BEGIN!: Do not edit below this line. */ | |||
/* | /* | |||
* Exported function declarations: | * Exported function declarations: | |||
*/ | */ | |||
#ifdef __WIN32__ /* WIN */ | #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ | |||
#ifndef Tcl_WinUtfToTChar_TCL_DECLARED | #ifndef Tcl_WinUtfToTChar_TCL_DECLARED | |||
#define Tcl_WinUtfToTChar_TCL_DECLARED | #define Tcl_WinUtfToTChar_TCL_DECLARED | |||
/* 0 */ | /* 0 */ | |||
EXTERN TCHAR * Tcl_WinUtfToTChar(CONST char *str, int len, | EXTERN TCHAR * Tcl_WinUtfToTChar(CONST char *str, int len, | |||
Tcl_DString *dsPtr); | Tcl_DString *dsPtr); | |||
#endif | #endif | |||
#ifndef Tcl_WinTCharToUtf_TCL_DECLARED | #ifndef Tcl_WinTCharToUtf_TCL_DECLARED | |||
#define Tcl_WinTCharToUtf_TCL_DECLARED | #define Tcl_WinTCharToUtf_TCL_DECLARED | |||
/* 1 */ | /* 1 */ | |||
EXTERN char * Tcl_WinTCharToUtf(CONST TCHAR *str, int len, | EXTERN char * Tcl_WinTCharToUtf(CONST TCHAR *str, int len, | |||
skipping to change at line 83 | skipping to change at line 80 | |||
CONST char *bundleVersion, | CONST char *bundleVersion, | |||
int hasResourceFile, int maxPathLen, | int hasResourceFile, int maxPathLen, | |||
char *libraryPath); | char *libraryPath); | |||
#endif | #endif | |||
#endif /* MACOSX */ | #endif /* MACOSX */ | |||
typedef struct TclPlatStubs { | typedef struct TclPlatStubs { | |||
int magic; | int magic; | |||
struct TclPlatStubHooks *hooks; | struct TclPlatStubHooks *hooks; | |||
#ifdef __WIN32__ /* WIN */ | #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ | |||
TCHAR * (*tcl_WinUtfToTChar) (CONST char *str, int len, Tcl_DString *ds Ptr); /* 0 */ | TCHAR * (*tcl_WinUtfToTChar) (CONST char *str, int len, Tcl_DString *ds Ptr); /* 0 */ | |||
char * (*tcl_WinTCharToUtf) (CONST TCHAR *str, int len, Tcl_DString *ds Ptr); /* 1 */ | char * (*tcl_WinTCharToUtf) (CONST TCHAR *str, int len, Tcl_DString *ds Ptr); /* 1 */ | |||
#endif /* WIN */ | #endif /* WIN */ | |||
#ifdef MAC_OSX_TCL /* MACOSX */ | #ifdef MAC_OSX_TCL /* MACOSX */ | |||
int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, CONST char *b undleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */ | int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, CONST char *b undleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */ | |||
int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, CONS T char *bundleName, CONST char *bundleVersion, int hasResourceFile, int max PathLen, char *libraryPath); /* 1 */ | int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, CONS T char *bundleName, CONST char *bundleVersion, int hasResourceFile, int max PathLen, char *libraryPath); /* 1 */ | |||
#endif /* MACOSX */ | #endif /* MACOSX */ | |||
} TclPlatStubs; | } TclPlatStubs; | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
skipping to change at line 107 | skipping to change at line 104 | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) | #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) | |||
/* | /* | |||
* Inline function declarations: | * Inline function declarations: | |||
*/ | */ | |||
#ifdef __WIN32__ /* WIN */ | #if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */ | |||
#ifndef Tcl_WinUtfToTChar | #ifndef Tcl_WinUtfToTChar | |||
#define Tcl_WinUtfToTChar \ | #define Tcl_WinUtfToTChar \ | |||
(tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */ | (tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */ | |||
#endif | #endif | |||
#ifndef Tcl_WinTCharToUtf | #ifndef Tcl_WinTCharToUtf | |||
#define Tcl_WinTCharToUtf \ | #define Tcl_WinTCharToUtf \ | |||
(tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */ | (tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */ | |||
#endif | #endif | |||
#endif /* WIN */ | #endif /* WIN */ | |||
#ifdef MAC_OSX_TCL /* MACOSX */ | #ifdef MAC_OSX_TCL /* MACOSX */ | |||
End of changes. 6 change blocks. | ||||
14 lines changed or deleted | 11 lines changed or added | |||
tclTomMathDecls.h | tclTomMathDecls.h | |||
---|---|---|---|---|
skipping to change at line 458 | skipping to change at line 458 | |||
EXTERN int TclBN_s_mp_sqr(mp_int *a, mp_int *b); | EXTERN int TclBN_s_mp_sqr(mp_int *a, mp_int *b); | |||
#endif | #endif | |||
#ifndef TclBN_s_mp_sub_TCL_DECLARED | #ifndef TclBN_s_mp_sub_TCL_DECLARED | |||
#define TclBN_s_mp_sub_TCL_DECLARED | #define TclBN_s_mp_sub_TCL_DECLARED | |||
/* 60 */ | /* 60 */ | |||
EXTERN int TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c); | EXTERN int TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c); | |||
#endif | #endif | |||
#ifndef TclBN_mp_init_set_int_TCL_DECLARED | #ifndef TclBN_mp_init_set_int_TCL_DECLARED | |||
#define TclBN_mp_init_set_int_TCL_DECLARED | #define TclBN_mp_init_set_int_TCL_DECLARED | |||
/* 61 */ | /* 61 */ | |||
EXTERN int TclBN_mp_init_set_int(mp_int*a, unsigned long i); | EXTERN int TclBN_mp_init_set_int(mp_int *a, unsigned long i); | |||
#endif | #endif | |||
#ifndef TclBN_mp_set_int_TCL_DECLARED | #ifndef TclBN_mp_set_int_TCL_DECLARED | |||
#define TclBN_mp_set_int_TCL_DECLARED | #define TclBN_mp_set_int_TCL_DECLARED | |||
/* 62 */ | /* 62 */ | |||
EXTERN int TclBN_mp_set_int(mp_int*a, unsigned long i); | EXTERN int TclBN_mp_set_int(mp_int *a, unsigned long i); | |||
#endif | #endif | |||
#ifndef TclBN_mp_cnt_lsb_TCL_DECLARED | #ifndef TclBN_mp_cnt_lsb_TCL_DECLARED | |||
#define TclBN_mp_cnt_lsb_TCL_DECLARED | #define TclBN_mp_cnt_lsb_TCL_DECLARED | |||
/* 63 */ | /* 63 */ | |||
EXTERN int TclBN_mp_cnt_lsb(mp_int*a); | EXTERN int TclBN_mp_cnt_lsb(mp_int *a); | |||
#endif | #endif | |||
typedef struct TclTomMathStubs { | typedef struct TclTomMathStubs { | |||
int magic; | int magic; | |||
struct TclTomMathStubHooks *hooks; | struct TclTomMathStubHooks *hooks; | |||
int (*tclBN_epoch) (void); /* 0 */ | int (*tclBN_epoch) (void); /* 0 */ | |||
int (*tclBN_revision) (void); /* 1 */ | int (*tclBN_revision) (void); /* 1 */ | |||
int (*tclBN_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 2 */ | int (*tclBN_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 2 */ | |||
int (*tclBN_mp_add_d) (mp_int *a, mp_digit b, mp_int *c); /* 3 */ | int (*tclBN_mp_add_d) (mp_int *a, mp_digit b, mp_int *c); /* 3 */ | |||
skipping to change at line 536 | skipping to change at line 536 | |||
int (*tclBN_fast_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int d igs); /* 51 */ | int (*tclBN_fast_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int d igs); /* 51 */ | |||
int (*tclBN_fast_s_mp_sqr) (mp_int *a, mp_int *b); /* 52 */ | int (*tclBN_fast_s_mp_sqr) (mp_int *a, mp_int *b); /* 52 */ | |||
int (*tclBN_mp_karatsuba_mul) (mp_int *a, mp_int *b, mp_int *c); /* 53 */ | int (*tclBN_mp_karatsuba_mul) (mp_int *a, mp_int *b, mp_int *c); /* 53 */ | |||
int (*tclBN_mp_karatsuba_sqr) (mp_int *a, mp_int *b); /* 54 */ | int (*tclBN_mp_karatsuba_sqr) (mp_int *a, mp_int *b); /* 54 */ | |||
int (*tclBN_mp_toom_mul) (mp_int *a, mp_int *b, mp_int *c); /* 55 */ | int (*tclBN_mp_toom_mul) (mp_int *a, mp_int *b, mp_int *c); /* 55 */ | |||
int (*tclBN_mp_toom_sqr) (mp_int *a, mp_int *b); /* 56 */ | int (*tclBN_mp_toom_sqr) (mp_int *a, mp_int *b); /* 56 */ | |||
int (*tclBN_s_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 57 */ | int (*tclBN_s_mp_add) (mp_int *a, mp_int *b, mp_int *c); /* 57 */ | |||
int (*tclBN_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int digs); /* 58 */ | int (*tclBN_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int digs); /* 58 */ | |||
int (*tclBN_s_mp_sqr) (mp_int *a, mp_int *b); /* 59 */ | int (*tclBN_s_mp_sqr) (mp_int *a, mp_int *b); /* 59 */ | |||
int (*tclBN_s_mp_sub) (mp_int *a, mp_int *b, mp_int *c); /* 60 */ | int (*tclBN_s_mp_sub) (mp_int *a, mp_int *b, mp_int *c); /* 60 */ | |||
int (*tclBN_mp_init_set_int) (mp_int*a, unsigned long i); /* 61 */ | int (*tclBN_mp_init_set_int) (mp_int *a, unsigned long i); /* 61 */ | |||
int (*tclBN_mp_set_int) (mp_int*a, unsigned long i); /* 62 */ | int (*tclBN_mp_set_int) (mp_int *a, unsigned long i); /* 62 */ | |||
int (*tclBN_mp_cnt_lsb) (mp_int*a); /* 63 */ | int (*tclBN_mp_cnt_lsb) (mp_int *a); /* 63 */ | |||
} TclTomMathStubs; | } TclTomMathStubs; | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
extern TclTomMathStubs *tclTomMathStubsPtr; | extern TclTomMathStubs *tclTomMathStubsPtr; | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
End of changes. 4 change blocks. | ||||
6 lines changed or deleted | 6 lines changed or added | |||