summaryrefslogtreecommitdiffstats
path: root/generic/tcl.h
diff options
context:
space:
mode:
authornijtmans <nijtmans>2009-12-21 23:25:39 (GMT)
committernijtmans <nijtmans>2009-12-21 23:25:39 (GMT)
commitf7e02c57c848c495a77975b927a0f4076bf4822c (patch)
tree86d9a8cc06d969564b99b6d5ed25975042f9300a /generic/tcl.h
parente3f5e21f00d98dacf701c346899ada0ef3327513 (diff)
downloadtcl-f7e02c57c848c495a77975b927a0f4076bf4822c.zip
tcl-f7e02c57c848c495a77975b927a0f4076bf4822c.tar.gz
tcl-f7e02c57c848c495a77975b927a0f4076bf4822c.tar.bz2
Various CYGWIN-related fixes. In the win32 configure script, CYGWIN is still not enabled yet, but at least it is a step in the right direction.
Diffstat (limited to 'generic/tcl.h')
-rw-r--r--generic/tcl.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index a13b897..fb4cbdc 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -14,7 +14,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.293 2009/11/30 23:10:38 nijtmans Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.294 2009/12/21 23:25:39 nijtmans Exp $
*/
#ifndef _TCL
@@ -129,6 +129,12 @@ extern "C" {
#define TCL_DECLARE_MUTEX(name)
#endif
+#if defined(__CYGWIN__) && defined(__WIN32__)
+/* Cygwin/win32 needs winsock2.h to be included BEFORE stdio.h,
+ * otherwise there will be symbol conflicts with sys/types.h! */
+# include <winsock2.h>
+#endif
+
/*
* Tcl's public routine Tcl_FSSeek() uses the values SEEK_SET, SEEK_CUR, and
* SEEK_END, all #define'd by stdio.h .