diff options
| author | das <das> | 2005-05-14 20:46:43 (GMT) | 
|---|---|---|
| committer | das <das> | 2005-05-14 20:46:43 (GMT) | 
| commit | 8b13ff0ad1ee04537de89781a6120d4d0b389da3 (patch) | |
| tree | 8485c76ab6a0159bc2f9c1907dc085c2fc922e72 /unix/tclUnixChan.c | |
| parent | 2db502f47e70e6d709baafe24f8461042496cc90 (diff) | |
| download | tcl-8b13ff0ad1ee04537de89781a6120d4d0b389da3.zip tcl-8b13ff0ad1ee04537de89781a6120d4d0b389da3.tar.gz tcl-8b13ff0ad1ee04537de89781a6120d4d0b389da3.tar.bz2  | |
	* generic/tclInt.decls:
	* generic/tclTest.c:
	* generic/tclUtil.c:
	* win/tclWin32Dll.c: fixed link error due to direct access by
	tclTest.c to the MODULE_SCOPE tclPlatform global: renamed existing
	TclWinGetPlatform() accessor to TclGetPlatform() and moved it to
	generic code so that it can be used by on all platforms where
	MODULE_SCOPE is enforced.
	* macosx/tclMacOSXBundle.c:
	* unix/tclUnixInit.c:
	* unix/tcl.m4 (Darwin): made use of CoreFoundation API configurable
	and added test of CoreFoundation availablility to allow building on
	ppc64, replaced HAVE_CFBUNDLE by HAVE_COREFOUNDATION; test for
	availability of Tiger or later OSSpinLockLock API.
	* unix/tclUnixNotfy.c:
	* unix/Makefile.in:
	* macosx/tclMacOSXNotify.c (new file): when CoreFoundation is
	available, use new CFRunLoop based notifier: allows easy integration
	with other event loops on Mac OS X, in particular the TkAqua Carbon
	event loop is now integrated via a standard tcl event source (instead
	of TkAqua upon loading having to finalize the exsting notifier and
	replace it with its custom version). [Patch 1202052]
	* tests/unixNotfy.test: don't run unthreaded tests on Darwin
	since notifier may be using threads even in unthreaded core.
	* unix/tclUnixPort.h:
	* unix/tcl.m4 (Darwin): test for thread-unsafe realpath durning
	configure, as Darwin 7 and later realpath is threadsafe.
	* macosx/Makefile: enable configure caching.
	* unix/configure.in: wrap tclConfig.h header in #ifndef _TCLCONFIG so
	that it can be included more than once without warnings from gcc4.0
	(as happens e.g. when including both tclInt.h and tclPort.h)
	* macosx/tclMacOSXBundle.c:
	* unix/tclUnixChan.c:
	* unix/tclLoadDyld.c:
	* unix/tclUnixInit.c: fixed gcc 4.0 warnings.
	* unix/configure: autoconf-2.59
	* unix/tclConfig.h.in: autoheader-2.59
	* generic/tclIntDecls.h:
	* generic/tclIntPlatDecls.h:
	* generic/tclStubInit.c: make genstubs
Diffstat (limited to 'unix/tclUnixChan.c')
| -rw-r--r-- | unix/tclUnixChan.c | 20 | 
1 files changed, 12 insertions, 8 deletions
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index b6a5555..abc2edc 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.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: tclUnixChan.c,v 1.56 2005/05/10 18:35:27 kennykb Exp $ + * RCS: @(#) $Id: tclUnixChan.c,v 1.57 2005/05/14 20:46:48 das Exp $   */  #include "tclInt.h"	/* Internal definitions for Tcl. */ @@ -43,6 +43,13 @@  #define SUPPORTS_TTY +#undef DIRECT_BAUD +#ifdef B4800 +#   if (B4800 == 4800) +#	define DIRECT_BAUD +#   endif /* B4800 == 4800 */ +#endif /* B4800 */ +  #ifdef USE_TERMIOS  #   include <termios.h>  #   ifdef HAVE_SYS_IOCTL_H @@ -261,11 +268,15 @@ static int		TtyCloseProc _ANSI_ARGS_((ClientData instanceData,  			    Tcl_Interp *interp));  static void		TtyGetAttributes _ANSI_ARGS_((int fd,  			    TtyAttrs *ttyPtr)); +#ifndef DIRECT_BAUD  static int		TtyGetBaud _ANSI_ARGS_((unsigned long speed)); +#endif  static int		TtyGetOptionProc _ANSI_ARGS_((ClientData instanceData,  			    Tcl_Interp *interp, CONST char *optionName,  			    Tcl_DString *dsPtr)); +#ifndef DIRECT_BAUD  static unsigned long	TtyGetSpeed _ANSI_ARGS_((int baud)); +#endif  static FileState *	TtyInit _ANSI_ARGS_((int fd, int initialize));  static void		TtyModemStatusStr _ANSI_ARGS_((int status,  			    Tcl_DString *dsPtr)); @@ -1190,13 +1201,6 @@ TtyGetOptionProc(instanceData, interp, optionName, dsPtr)      }  } -#undef DIRECT_BAUD -#ifdef B4800 -#   if (B4800 == 4800) -#	define DIRECT_BAUD -#   endif /* B4800 == 4800 */ -#endif /* B4800 */ -  #ifdef DIRECT_BAUD  #   define TtyGetSpeed(baud)   ((unsigned) (baud))  #   define TtyGetBaud(speed)   ((int) (speed))  | 
