diff options
| -rw-r--r-- | generic/tcl.h | 35 | ||||
| -rw-r--r-- | generic/tclAlloc.c | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 1 | ||||
| -rw-r--r-- | win/tclWinPort.h | 22 | ||||
| -rw-r--r-- | win/tclWinThrd.c | 4 | ||||
| -rw-r--r-- | win/tclWinTime.c | 19 |
6 files changed, 23 insertions, 60 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 8993168..dfd025f 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -192,8 +192,7 @@ extern "C" { * MSVCRT. */ -#if (defined(_WIN32) && (defined(_MSC_VER) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0550)) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec)))) -# define HAVE_DECLSPEC 1 +#ifdef _WIN32 # ifdef STATIC_BUILD # define DLLIMPORT # define DLLEXPORT @@ -361,16 +360,24 @@ typedef long LONG; * sprintf(...,"%" TCL_LL_MODIFIER "d",...). */ -#if !defined(TCL_WIDE_INT_TYPE) && !defined(TCL_WIDE_INT_IS_LONG) && !defined(_WIN32) +#if !defined(TCL_WIDE_INT_TYPE) && !defined(TCL_WIDE_INT_IS_LONG) +# ifdef _WIN32 +# if defined(_WIN32) && (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO) +# define TCL_LL_MODIFIER "I64" +# else +# define TCL_LL_MODIFIER "ll" +# endif +# elif !defined(__GNUC__) /* * Don't know what platform it is and configure hasn't discovered what is * going on for us. Try to guess... */ -# include <limits.h> -# if defined(LLONG_MAX) && (LLONG_MAX == LONG_MAX) -# define TCL_WIDE_INT_IS_LONG 1 -# endif -#endif +# include <limits.h> +# if defined(LLONG_MAX) && (LLONG_MAX == LONG_MAX) +# define TCL_WIDE_INT_IS_LONG 1 +# endif +# endif /* !__GNUC__ */ +#endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */ #ifndef TCL_WIDE_INT_TYPE # define TCL_WIDE_INT_TYPE long long @@ -380,11 +387,7 @@ typedef TCL_WIDE_INT_TYPE Tcl_WideInt; typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; #ifndef TCL_LL_MODIFIER -# if defined(_WIN32) && (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO) -# define TCL_LL_MODIFIER "I64" -# else -# define TCL_LL_MODIFIER "ll" -# endif +# define TCL_LL_MODIFIER "ll" #endif /* !TCL_LL_MODIFIER */ #ifndef TCL_Z_MODIFIER # if defined(__GNUC__) && !defined(_WIN32) @@ -400,10 +403,8 @@ typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; #define Tcl_WideAsDouble(val) ((double)((Tcl_WideInt)(val))) #define Tcl_DoubleAsWide(val) ((Tcl_WideInt)((double)(val))) -#if defined(_WIN32) -# ifdef __BORLANDC__ - typedef struct stati64 Tcl_StatBuf; -# elif defined(_WIN64) || defined(_USE_64BIT_TIME_T) +#ifdef _WIN32 +# if defined(_WIN64) || defined(_USE_64BIT_TIME_T) typedef struct __stat64 Tcl_StatBuf; # elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIME_T) typedef struct _stati64 Tcl_StatBuf; diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c index 81cd646..70cb1b6 100644 --- a/generic/tclAlloc.c +++ b/generic/tclAlloc.c @@ -31,7 +31,7 @@ * until Tcl uses config.h properly. */ -#if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__MSVCRT__) typedef size_t caddr_t; #endif diff --git a/unix/tcl.m4 b/unix/tcl.m4 index d788ed2..95a9e10 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -2352,7 +2352,6 @@ AC_DEFUN([SC_TCL_EARLY_FLAGS],[ # # Might define the following vars: # TCL_WIDE_INT_IS_LONG -# TCL_WIDE_INT_TYPE # HAVE_STRUCT_DIRENT64, HAVE_DIR64 # HAVE_STRUCT_STAT64 # HAVE_TYPE_OFF64_T diff --git a/win/tclWinPort.h b/win/tclWinPort.h index e497a23..455ceab 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -111,11 +111,7 @@ typedef DWORD_PTR * PDWORD_PTR; #ifndef __MWERKS__ #include <sys/stat.h> #include <sys/timeb.h> -# ifdef __BORLANDC__ -# include <utime.h> -# else -# include <sys/utime.h> -# endif /* __BORLANDC__ */ +#include <sys/utime.h> #endif /* __MWERKS__ */ /* @@ -461,22 +457,6 @@ typedef DWORD_PTR * PDWORD_PTR; # endif #endif /* _MSC_VER || __MSVCRT__ */ -/* - * Borland's timezone and environ functions. - */ - -#ifdef __BORLANDC__ -# define timezone _timezone -# define environ _environ -#endif /* __BORLANDC__ */ - -#ifdef __WATCOMC__ -# if !defined(__CHAR_SIGNED__) -# error "You must use the -j switch to ensure char is signed." -# endif -#endif - - #if defined(_MSC_VER) # pragma warning(disable:4146) # pragma warning(disable:4244) diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c index 1095a6c..86db837 100644 --- a/win/tclWinThrd.c +++ b/win/tclWinThrd.c @@ -222,7 +222,7 @@ TclpThreadCreate( * on WIN64 sizeof void* != sizeof unsigned */ -#if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__MSVCRT__) tHandle = (HANDLE) _beginthreadex(NULL, (unsigned) stackSize, (Tcl_ThreadCreateProc*) TclWinThreadStart, winThreadPtr, 0, (unsigned *)idPtr); @@ -300,7 +300,7 @@ TclpThreadExit( TclSignalExitThread(Tcl_GetCurrentThread(), status); LeaveCriticalSection(&joinLock); -#if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__MSVCRT__) _endthreadex((unsigned) status); #else ExitThread((DWORD) status); diff --git a/win/tclWinTime.c b/win/tclWinTime.c index b18c83f..088c02b 100644 --- a/win/tclWinTime.c +++ b/win/tclWinTime.c @@ -754,24 +754,7 @@ TclpGetDate( * daylight savings time before the epoch. */ - /* - * Hm, Borland's localtime manages to return NULL under certain - * circumstances (e.g. wintime.test, test 1.2). Nobody tests for this, - * since 'localtime' isn't supposed to do this, possibly leading to - * crashes. - * - * Patch: We only call this function if we are at least one day into - * the epoch, else we handle it ourselves (like we do for times < 0). - * H. Giese, June 2003 - */ - -#ifdef __BORLANDC__ -#define LOCALTIME_VALIDITY_BOUNDARY SECSPERDAY -#else -#define LOCALTIME_VALIDITY_BOUNDARY 0 -#endif - - if (t2 >= LOCALTIME_VALIDITY_BOUNDARY) { + if (t2 >= 0) { return TclpLocaltime(&t2); } |