From b8bb94671e8999fad9dd12e9a182bafb1f030c19 Mon Sep 17 00:00:00 2001
From: mdejong <mdejong>
Date: Tue, 17 Jul 2001 02:01:23 +0000
Subject: 	* generic/tcl.h: Define __WIN32__ when 	__CYGWIN__ or
 __MINGW32__ is defined. 	* generic/tclAlloc.c: Define caddr_t when 
 compiling with VC++ or mingw. This type is 	already defined when compiling
 with Cygwin.

---
 ChangeLog          | 8 ++++++++
 generic/tcl.h      | 5 +++--
 generic/tclAlloc.c | 7 ++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3831490..e6cb970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2001-07-16  Mo DeJong  <mdejong@redhat.com>
 
+	* generic/tcl.h: Define __WIN32__ when
+	__CYGWIN__ or __MINGW32__ is defined.
+	* generic/tclAlloc.c: Define caddr_t when
+	compiling with VC++ or mingw. This type is
+	already defined when compiling with Cygwin.
+
+2001-07-16  Mo DeJong  <mdejong@redhat.com>
+
 	* win/tclWinConsole.c:
 	* win/tclWinPipe.c:
 	* win/tclWinPort.h:
diff --git a/generic/tcl.h b/generic/tcl.h
index a08cbc8..08ae9c3 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.92 2001/07/12 13:15:09 dkf Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.93 2001/07/17 02:01:23 mdejong Exp $
  */
 
 #ifndef _TCL
@@ -71,7 +71,8 @@ extern "C" {
  */
 
 #ifndef __WIN32__
-#   if defined(_WIN32) || defined(WIN32)
+#   if defined(_WIN32) || defined(WIN32) || \
+       defined(__CYGWIN__) || defined(__MINGW32__)
 #	define __WIN32__
 #   endif
 #endif
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index cbeadda..e40fa34 100644
--- a/generic/tclAlloc.c
+++ b/generic/tclAlloc.c
@@ -15,7 +15,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclAlloc.c,v 1.9 2000/04/21 04:04:12 hobbs Exp $
+ * RCS: @(#) $Id: tclAlloc.c,v 1.10 2001/07/17 02:01:23 mdejong Exp $
  */
 
 #include "tclInt.h"
@@ -30,9 +30,10 @@
 #endif
 
 /*
- * On Unix this will already be defined
+ * We should really make use of AC_CHECK_TYPE(caddr_t)
+ * here, but it can wait until Tcl uses config.h properly.
  */
-#if defined(WIN32) || defined(MAC_TCL)
+#if defined(MAC_TCL) || defined(_MSC_VER) || defined(__MINGW32__)
 typedef unsigned long caddr_t;
 #endif
 
-- 
cgit v0.12