summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordas <das>2005-04-26 00:46:01 (GMT)
committerdas <das>2005-04-26 00:46:01 (GMT)
commit24fcde64c436af06b6824359ff50920a2933af27 (patch)
treed2c829948c33b0a374795c6a0e4bc7713a578d48 /generic
parente3d20a2783044861949b7a0230410548b1c59982 (diff)
downloadtcl-24fcde64c436af06b6824359ff50920a2933af27.zip
tcl-24fcde64c436af06b6824359ff50920a2933af27.tar.gz
tcl-24fcde64c436af06b6824359ff50920a2933af27.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). * unix/tclUnixNotfy.c (Tcl_WaitForEvent): sync with HEAD: only declare and use timeout var in unthreaded core. * unix/Makefile.in: added @PLAT_SRCS@ to SRCS and split out NOTIFY_SRCS from UNIX_SRCS for parity with UNIX_OBJS & NOTIFY_OBJS. * unix/configure.in: only run check for broken strstr implementation if AC_REPLACE_FUNCS(strstr) hasn't already determined that strstr is unavailable, otherwise compat/strstr.o will be used twice (resulting in duplicate symbol link errors on Mac OS X 10.1) * 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. (SC_MISSING_POSIX_HEADERS): added caching of dirent.h check. (SC_TCL_64BIT_FLAGS): fixed 'checking for off64_t' message output. * unix/configure: autoconf-2.13
Diffstat (limited to 'generic')
-rw-r--r--generic/tclNotify.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tclNotify.c b/generic/tclNotify.c
index abd4e04..c09d851 100644
--- a/generic/tclNotify.c
+++ b/generic/tclNotify.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclNotify.c,v 1.11.2.1 2004/07/15 21:20:25 vasiljevic Exp $
+ * RCS: @(#) $Id: tclNotify.c,v 1.11.2.2 2005/04/26 00:46:02 das Exp $
*/
#include "tclInt.h"
@@ -68,6 +68,7 @@ typedef struct ThreadSpecificData {
Tcl_ThreadId threadId; /* Thread that owns this notifier instance. */
ClientData clientData; /* Opaque handle for platform specific
* notifier. */
+ int initialized; /* 1 if notifier has been initialized. */
struct ThreadSpecificData *nextPtr;
/* Next notifier in global list of notifiers.
* Access is controlled by the listLock global
@@ -118,6 +119,7 @@ TclInitNotifier()
tsdPtr->threadId = Tcl_GetCurrentThread();
tsdPtr->clientData = tclStubs.tcl_InitNotifier();
+ tsdPtr->initialized = 1;
tsdPtr->nextPtr = firstNotifierPtr;
firstNotifierPtr = tsdPtr;
@@ -157,7 +159,7 @@ TclFinalizeNotifier()
ThreadSpecificData **prevPtrPtr;
Tcl_Event *evPtr, *hold;
- if (tsdPtr->threadId == (Tcl_ThreadId)0) {
+ if (!tsdPtr->initialized) {
return; /* Notifier not initialized for the current thread */
}
@@ -184,6 +186,7 @@ TclFinalizeNotifier()
break;
}
}
+ tsdPtr->initialized = 0;
Tcl_MutexUnlock(&listLock);
}
@@ -876,7 +879,7 @@ Tcl_DoOneEvent(flags)
*/
if (Tcl_ServiceEvent(flags)) {
- result = 1;
+ result = 1;
break;
}