summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authormdejong <mdejong>2003-01-13 07:01:04 (GMT)
committermdejong <mdejong>2003-01-13 07:01:04 (GMT)
commitb697c7922f1ca98c8c68a6a8c1e7f738a4a8667f (patch)
treeecc693efc09e654dadea6aa7a3df8c882e5b75ae /generic
parent6638ab2cc75d41465a5191828f2c9acbab86af6b (diff)
downloadtcl-b697c7922f1ca98c8c68a6a8c1e7f738a4a8667f.zip
tcl-b697c7922f1ca98c8c68a6a8c1e7f738a4a8667f.tar.gz
tcl-b697c7922f1ca98c8c68a6a8c1e7f738a4a8667f.tar.bz2
* generic/tcl.h: Skip Tcl's define of CHAR,
SHORT, and LONG when HAVE_WINNT_IGNORE_VOID is defined. This avoids a bunch of compiler warnings when building with Cygwin or Mingw. * win/configure: Regen. * win/configure.in: Define HAVE_WINNT_IGNORE_VOID when we detect a winnt.h that still defines CHAR, SHORT, and LONG when VOID has already been defined. * win/tcl.m4 (SC_LOAD_TCLCONFIG): Subst the TCL_DEFS loaded from tclConfig.sh so that Tcl defines can make it into the Tk Makefile.
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index d84a23f..b89bb59 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,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.148 2002/11/12 02:24:51 hobbs Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.149 2003/01/13 07:01:06 mdejong Exp $
*/
#ifndef _TCL
@@ -287,15 +287,18 @@ extern "C" {
* The following code is copied from winnt.h.
* If we don't replicate it here, then <windows.h> can't be included
* after tcl.h, since tcl.h also defines VOID.
+ * This block is skipped under Cygwin and Mingw.
+ *
+ *
*/
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(HAVE_WINNT_IGNORE_VOID)
#ifndef VOID
#define VOID void
typedef char CHAR;
typedef short SHORT;
typedef long LONG;
#endif
-#endif /* __WIN32__ */
+#endif /* __WIN32__ && !HAVE_WINNT_IGNORE_VOID */
/*
* Macro to use instead of "void" for arguments that must have