From b2dd6e1abe85436999afebe24e3a7f37c7bea2e4 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Tue, 6 Dec 2005 08:21:22 +0000
Subject: 	* unix/tclUnixPort.h (Darwin): fix incorrect __DARWIN_UNIX03
 configure 	overrides that were originally copied from Darwin CVS
 (rdar://3693001).

---
 ChangeLog          |  5 +++++
 unix/tclUnixPort.h | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 290f823..d712a48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-05  Daniel Steffen  <das@users.sourceforge.net>
+
+	* unix/tclUnixPort.h (Darwin): fix incorrect __DARWIN_UNIX03 configure
+	overrides that were originally copied from Darwin CVS (rdar://3693001).
+
 2005-12-05  Don Porter  <dgp@users.sourceforge.net>
 
 	*** 8.4.12 TAGGED FOR RELEASE ***
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index ef8156f..fad82a8 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.7 2005/11/27 02:34:42 das Exp $
+ * RCS: @(#) $Id: tclUnixPort.h,v 1.27.2.8 2005/12/06 08:21:23 das Exp $
  */
 
 #ifndef _TCLUNIXPORT
@@ -513,13 +513,15 @@ extern double strtod();
 #   ifdef __LP64__
 #       undef HAVE_COREFOUNDATION
 #    endif /* __LP64__ */
-#   ifdef __DARWIN_UNIX03
-#       define USE_TERMIOS 1
-#       undef HAVE_PUTENV_THAT_COPIES
-#    else /* !__DARWIN_UNIX03 */
-#       undef USE_TERMIOS
-#       define HAVE_PUTENV_THAT_COPIES 1
-#    endif /* __DARWIN_UNIX03 */
+#   include <sys/cdefs.h>
+#   if defined(__DARWIN_UNIX03)
+#       if __DARWIN_UNIX03
+#           undef HAVE_PUTENV_THAT_COPIES
+#        else /* !__DARWIN_UNIX03 */
+#           define HAVE_PUTENV_THAT_COPIES 1
+#        endif /* __DARWIN_UNIX03 */
+#        define USE_TERMIOS 1
+#    endif /* defined(__DARWIN_UNIX03) */
 #endif /* __APPLE__ */
 
 /*
-- 
cgit v0.12