summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordas <das>2005-04-26 00:44:50 (GMT)
committerdas <das>2005-04-26 00:44:50 (GMT)
commitec3f17501d816894810d4d4ea984e4f60e6217fe (patch)
tree870018fbbebc7227bc3dc1184a844d0917132e2c /win
parenta03466eb703f065ba168616a8322005b0555df91 (diff)
downloadtcl-ec3f17501d816894810d4d4ea984e4f60e6217fe.zip
tcl-ec3f17501d816894810d4d4ea984e4f60e6217fe.tar.gz
tcl-ec3f17501d816894810d4d4ea984e4f60e6217fe.tar.bz2
* compat/string.h: fixed memchr() protoype for __APPLE__ so that we
build on Mac OS X 10.1 again. * generic/tclNotify.c (TclFinalizeNotifier): fixed notifier not being finalized in unthreaded core (was testing for notifier initialization in current thread by checking thread id != 0 but thread id is always 0 in untreaded core). * win/tclWinNotify.c (Tcl_WaitForEvent): * unix/tclUnixNotfy.c (Tcl_WaitForEvent): don't call ScaleTimeProc for zero wait times (as specified in TIP 233). * unix/Makefile.in: added @PLAT_SRCS@ to SRCS and split out NOTIFY_SRCS from UNIX_SRCS for parity with UNIX_OBJS & NOTIFY_OBJS. * unix/tcl.m4 (Darwin): added configure checks for recently added linker flags -single_module and -search_paths_first to allow building with older tools (and on Mac OS X 10.1), use -single_module in SHLIB_LD and not just T{CL,K}_SHLIB_LD_EXTRAS, added unexporting from Tk of symbols from libtclstub to avoid duplicate symbol warnings, added PLAT_SRCS definition for Mac OS X, defined MODULE_SCOPE to __private_extern__. (SC_MISSING_POSIX_HEADERS): added caching of dirent.h check. * unix/configure: autoconf-2.59
Diffstat (limited to 'win')
-rw-r--r--win/tclWinNotify.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
index 5c02108..fb92a7d 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.17 2005/01/21 22:25:35 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclWinNotify.c,v 1.18 2005/04/26 00:45:01 das Exp $
*/
#include "tclInt.h"
@@ -452,7 +452,9 @@ Tcl_WaitForEvent(
myTime.sec = timePtr->sec;
myTime.usec = timePtr->usec;
- (*tclScaleTimeProcPtr) (&myTime, tclTimeClientData);
+ if (myTime.sec != 0 || myTime.usec != 0) {
+ (*tclScaleTimeProcPtr) (&myTime, tclTimeClientData);
+ }
timeout = myTime.sec * 1000 + myTime.usec / 1000;
} else {