diff options
| author | dgp <dgp@users.sourceforge.net> | 2018-05-24 13:04:05 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2018-05-24 13:04:05 (GMT) |
| commit | 61169e4e9e47dcc0b65f18c4c133fc31048a32a3 (patch) | |
| tree | 78e3d480d23fde2f020e978d95a594f200dc8ce0 /unix/tclUnixNotfy.c | |
| parent | 5eafb95b32b1132d639b964d75e65c95e288b265 (diff) | |
| parent | edb38932e8f071b1326515067d41bc060807dec2 (diff) | |
| download | tcl-61169e4e9e47dcc0b65f18c4c133fc31048a32a3.zip tcl-61169e4e9e47dcc0b65f18c4c133fc31048a32a3.tar.gz tcl-61169e4e9e47dcc0b65f18c4c133fc31048a32a3.tar.bz2 | |
merge 8.7
Diffstat (limited to 'unix/tclUnixNotfy.c')
| -rw-r--r-- | unix/tclUnixNotfy.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c index b7df740..fb7e569 100644 --- a/unix/tclUnixNotfy.c +++ b/unix/tclUnixNotfy.c @@ -12,29 +12,30 @@ */ #include <poll.h> +#include "tclInt.h" /* * Static routines defined in this file. */ -#ifdef NOTIFIER_SELECT -#ifdef TCL_THREADS +static int FileHandlerEventProc(Tcl_Event *evPtr, int flags); +#if !TCL_THREADS +# undef NOTIFIER_EPOLL +# undef NOTIFIER_KQUEUE +# define NOTIFIER_SELECT +#elif !defined(NOTIFIER_EPOLL) && !defined(NOTIFIER_KQUEUE) +# define NOTIFIER_SELECT static TCL_NORETURN void NotifierThreadProc(ClientData clientData); -#if defined(HAVE_PTHREAD_ATFORK) +# if defined(HAVE_PTHREAD_ATFORK) static void AtForkChild(void); -#endif /* HAVE_PTHREAD_ATFORK */ -#endif /* TCL_THREADS */ -#endif /* NOTIFIER_SELECT */ -static int FileHandlerEventProc(Tcl_Event *evPtr, int flags); +# endif /* HAVE_PTHREAD_ATFORK */ -#ifdef NOTIFIER_SELECT -#if TCL_THREADS /* *---------------------------------------------------------------------- * * StartNotifierThread -- * - * Start a notfier thread and wait for the notifier pipe to be created. + * Start a notifier thread and wait for the notifier pipe to be created. * * Results: * None. @@ -70,7 +71,6 @@ StartNotifierThread(const char *proc) pthread_mutex_unlock(¬ifierInitMutex); } } -#endif /* TCL_THREADS */ #endif /* NOTIFIER_SELECT */ /* @@ -107,7 +107,7 @@ Tcl_AlertNotifier( return; } else { #ifdef NOTIFIER_SELECT -#ifdef TCL_THREADS +#if TCL_THREADS ThreadSpecificData *tsdPtr = clientData; pthread_mutex_lock(¬ifierMutex); @@ -280,7 +280,7 @@ FileHandlerEventProc( } #ifdef NOTIFIER_SELECT -#ifdef TCL_THREADS +#if TCL_THREADS /* *---------------------------------------------------------------------- * |