diff options
author | nijtmans <nijtmans> | 2008-07-24 21:54:38 (GMT) |
---|---|---|
committer | nijtmans <nijtmans> | 2008-07-24 21:54:38 (GMT) |
commit | 7f55ab2959b7ec3cac71c72171f20aed26c8f016 (patch) | |
tree | d6af35eba3a72d32359fa5a28abd6fe83823567d /generic/tcl.h | |
parent | 7b1a1c06d6d6cdf4035ef5b35802f85862b27088 (diff) | |
download | tcl-7f55ab2959b7ec3cac71c72171f20aed26c8f016.zip tcl-7f55ab2959b7ec3cac71c72171f20aed26c8f016.tar.gz tcl-7f55ab2959b7ec3cac71c72171f20aed26c8f016.tar.bz2 |
CONSTified 4 functions in the Notifier which all have a Tcl_Time* in it which is
supposed to be a constant, but this was not reflected in the API:
Tcl_SetTimer
Tcl_WaitForEvent
Tcl_ConditionWait
Tcl_SetMaxBlockTime
Introduced a CONST86, so extensions which have their own Notifier
(are there any?) can be modified to compile against both Tcl 8.5
and Tcl 8.6. This change complies with TIP #24
Diffstat (limited to 'generic/tcl.h')
-rw-r--r-- | generic/tcl.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index ef6d360..6b539ea 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.261 2008/07/18 13:46:43 msofer Exp $ + * RCS: @(#) $Id: tcl.h,v 1.262 2008/07/24 21:54:38 nijtmans Exp $ */ #ifndef _TCL @@ -145,7 +145,7 @@ extern "C" { * * The following TCL_VARARGS* macros are to support old extensions * written for older versions of Tcl where the macros permitted - * support for the varargs.h system as well as stdarg.h . + * support for the varargs.h system as well as stdarg.h . * * New code should just directly be written to use stdarg.h conventions. */ @@ -167,7 +167,7 @@ extern "C" { * Note: when building static but linking dynamically to MSVCRT we must still * correctly decorate the C library imported function. Use CRTIMPORT * for this purpose. _DLL is defined by the compiler when linking to - * MSVCRT. + * MSVCRT. */ #if (defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec)))) @@ -261,6 +261,8 @@ extern "C" { # endif #endif +#define CONST86 CONST84 + /* * Make sure EXTERN isn't defined elsewhere */ @@ -987,7 +989,7 @@ typedef struct Tcl_DString { * stack for the script in progress to be * completely unwound. * TCL_EVAL_NOERR: Do no exception reporting at all, just return - * as the caller will report. + * as the caller will report. */ #define TCL_NO_EVAL 0x10000 #define TCL_EVAL_GLOBAL 0x20000 @@ -1341,8 +1343,8 @@ typedef struct Tcl_Time { long usec; /* Microseconds. */ } Tcl_Time; -typedef void (Tcl_SetTimerProc) _ANSI_ARGS_((Tcl_Time *timePtr)); -typedef int (Tcl_WaitForEventProc) _ANSI_ARGS_((Tcl_Time *timePtr)); +typedef void (Tcl_SetTimerProc) _ANSI_ARGS_((CONST86 Tcl_Time *timePtr)); +typedef int (Tcl_WaitForEventProc) _ANSI_ARGS_((CONST86 Tcl_Time *timePtr)); /* * TIP #233 (Virtualized Time) |