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 /win | |
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 'win')
-rw-r--r-- | win/tclWinNotify.c | 6 | ||||
-rw-r--r-- | win/tclWinThrd.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c index 8d19ba2..436d333 100644 --- a/win/tclWinNotify.c +++ b/win/tclWinNotify.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: tclWinNotify.c,v 1.23 2008/06/13 05:45:15 mistachkin Exp $ + * RCS: @(#) $Id: tclWinNotify.c,v 1.24 2008/07/24 21:54:43 nijtmans Exp $ */ #include "tclInt.h" @@ -268,7 +268,7 @@ Tcl_AlertNotifier( void Tcl_SetTimer( - Tcl_Time *timePtr) /* Maximum block time, or NULL. */ + const Tcl_Time *timePtr) /* Maximum block time, or NULL. */ { if (tclNotifierHooks.setTimerProc) { tclNotifierHooks.setTimerProc(timePtr); @@ -431,7 +431,7 @@ NotifierProc( int Tcl_WaitForEvent( - Tcl_Time *timePtr) /* Maximum block time, or NULL. */ + const Tcl_Time *timePtr) /* Maximum block time, or NULL. */ { if (tclNotifierHooks.waitForEventProc) { return tclNotifierHooks.waitForEventProc(timePtr); diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c index d9dd0f7..9667d7d 100644 --- a/win/tclWinThrd.c +++ b/win/tclWinThrd.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: tclWinThrd.c,v 1.47 2008/07/16 23:31:29 georgeps Exp $ + * RCS: @(#) $Id: tclWinThrd.c,v 1.48 2008/07/24 21:54:43 nijtmans Exp $ */ #include "tclWinInt.h" @@ -590,7 +590,7 @@ void Tcl_ConditionWait( Tcl_Condition *condPtr, /* Really (WinCondition **) */ Tcl_Mutex *mutexPtr, /* Really (CRITICAL_SECTION **) */ - Tcl_Time *timePtr) /* Timeout on waiting period */ + const Tcl_Time *timePtr) /* Timeout on waiting period */ { WinCondition *winCondPtr; /* Per-condition queue head */ CRITICAL_SECTION *csPtr; /* Caller's Mutex, after casting */ @@ -967,13 +967,13 @@ void *TclpThreadCreateKey (void) { if (key == NULL) { Tcl_Panic("unable to allocate thread key!"); } - + *key = TlsAlloc(); if (*key == TLS_OUT_OF_INDEXES) { Tcl_Panic("unable to allocate thread-local storage"); } - + return key; } @@ -989,7 +989,7 @@ void TclpThreadDeleteKey(void *keyPtr) { void TclpThreadSetMasterTSD(void *tsdKeyPtr, void *ptr) { DWORD *key = tsdKeyPtr; - + if (!TlsSetValue(*key, ptr)) { Tcl_Panic("unable to set master TSD value"); } |