summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2006-08-21 05:37:25 (GMT)
committerdas <das>2006-08-21 05:37:25 (GMT)
commit40c4ecfd456c65d392925accecc6bfcf589a502d (patch)
tree8b8788a7b8ee6fd0b870102e7f2417c181d499e1
parent24a1237af60c1f6ed662e89c824c6045ab7adc74 (diff)
downloadtcl-40c4ecfd456c65d392925accecc6bfcf589a502d.zip
tcl-40c4ecfd456c65d392925accecc6bfcf589a502d.tar.gz
tcl-40c4ecfd456c65d392925accecc6bfcf589a502d.tar.bz2
* unix/tclUnixPort.h (Darwin): override potentially faulty configure
detection of termios availability in all cases, since termios is known to be present on all Mac OS X releases since 10.0. [Bug 497147]
-rw-r--r--ChangeLog4
-rw-r--r--unix/tclUnixPort.h20
2 files changed, 17 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ceecef..f799715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
the system time; as a workaround, when given a very brief timeout, just
do a poll on that platform. [Bug 1457797]
+ * unix/tclUnixPort.h (Darwin): override potentially faulty configure
+ detection of termios availability in all cases, since termios is known
+ to be present on all Mac OS X releases since 10.0. [Bug 497147]
+
2006-08-18 Daniel Steffen <das@users.sourceforge.net>
* unix/tcl.m4 (Darwin): add support for --enable-64bit on x86_64, for
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index a747c40..2bbe201 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -19,7 +19,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixPort.h,v 1.27.2.13 2006/08/18 07:45:43 das Exp $
+ * RCS: @(#) $Id: tclUnixPort.h,v 1.27.2.14 2006/08/21 05:37:26 das Exp $
*/
#ifndef _TCLUNIXPORT
@@ -509,7 +509,7 @@ extern double strtod();
*/
#ifdef __APPLE__
-/*
+/*
* Support for fat compiles: configure runs only once for multiple architectures
*/
# if defined(__LP64__) && defined (NO_COREFOUNDATION_64)
@@ -522,18 +522,24 @@ extern double strtod();
# else
# define HAVE_PUTENV_THAT_COPIES 1
# endif
-# define USE_TERMIOS 1
-# undef USE_TERMIO
-# undef USE_SGTTY
# endif /* __DARWIN_UNIX03 */
-/*
+/*
+ * The termios configure test program relies on the configure script being run
+ * from a terminal, which is not the case e.g. when configuring from Xcode.
+ * Since termios is known to be present on all Mac OS X releases since 10.0,
+ * override the configure defines for serial API here. [Bug 497147]
+ */
+# define USE_TERMIOS 1
+# undef USE_TERMIO
+# undef USE_SGTTY
+/*
* Include AvailabilityMacros.h here (when available) to ensure any symbolic
* MAC_OS_X_VERSION_* constants passed on the command line are translated.
*/
# ifdef HAVE_AVAILABILITYMACROS_H
# include <AvailabilityMacros.h>
# endif
-/*
+/*
* Support for weak import.
*/
# ifdef HAVE_WEAK_IMPORT