diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-03-07 22:05:01 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-03-07 22:05:01 (GMT) |
| commit | e295a4ddd722dd78b3dcc40e624b6aad8d05dde8 (patch) | |
| tree | 76401e3e6e86441e3aeb2b15143d14c44963f5f4 /unix/tclUnixNotfy.c | |
| parent | 20556ad7dfd6e3e293b260eef2fd540e3d63346a (diff) | |
| download | tcl-e295a4ddd722dd78b3dcc40e624b6aad8d05dde8.zip tcl-e295a4ddd722dd78b3dcc40e624b6aad8d05dde8.tar.gz tcl-e295a4ddd722dd78b3dcc40e624b6aad8d05dde8.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'unix/tclUnixNotfy.c')
| -rw-r--r-- | unix/tclUnixNotfy.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c index 2574015..b459c49 100644 --- a/unix/tclUnixNotfy.c +++ b/unix/tclUnixNotfy.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: tclUnixNotfy.c,v 1.32 2006/08/21 01:08:03 das Exp $ + * RCS: @(#) $Id: tclUnixNotfy.c,v 1.32.6.1 2008/03/07 22:05:10 dgp Exp $ */ #include "tclInt.h" @@ -918,25 +918,12 @@ NotifierThreadProc( receivePipe = fds[0]; -#ifndef USE_FIONBIO - status = fcntl(receivePipe, F_GETFL); - status |= O_NONBLOCK; - if (fcntl(receivePipe, F_SETFL, status) < 0) { + if (TclUnixSetBlockingMode(receivePipe, TCL_MODE_NONBLOCKING) < 0) { Tcl_Panic("NotifierThreadProc: could not make receive pipe non blocking"); } - status = fcntl(fds[1], F_GETFL); - status |= O_NONBLOCK; - if (fcntl(fds[1], F_SETFL, status) < 0) { + if (TclUnixSetBlockingMode(fds[1], TCL_MODE_NONBLOCKING) < 0) { Tcl_Panic("NotifierThreadProc: could not make trigger pipe non blocking"); } -#else - if (ioctl(receivePipe, (int) FIONBIO, &status) < 0) { - Tcl_Panic("NotifierThreadProc: could not make receive pipe non blocking"); - } - if (ioctl(fds[1], (int) FIONBIO, &status) < 0) { - Tcl_Panic("NotifierThreadProc: could not make trigger pipe non blocking"); - } -#endif /* FIONBIO */ /* * Install the write end of the pipe into the global variable. |