diff options
| author | nijtmans <nijtmans> | 2010-01-22 13:02:50 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-01-22 13:02:50 (GMT) |
| commit | 054ab462a502b5dd37f904ad14e46190554dd8ba (patch) | |
| tree | 55e1b5a3324a9e4ba5914c4e528a6d7c4f81933d /generic/tcl.h | |
| parent | cc52b4d3c7d8a2d088216976f32ca253b404c75d (diff) | |
| download | tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.zip tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.tar.gz tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.tar.bz2 | |
Revert [2009-12-21] change in tcl.h, in stead
resolve the CYGWIN inclusion problems by
re-arranging the inclusions at other places.
Make cygwin configuration error into
a warning: CYGWIN compilation works
although there still are test failures.
Diffstat (limited to 'generic/tcl.h')
| -rw-r--r-- | generic/tcl.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index fb8a27b..bcf0251 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.296 2010/01/13 06:46:56 nijtmans Exp $ + * RCS: @(#) $Id: tcl.h,v 1.297 2010/01/22 13:02:50 nijtmans Exp $ */ #ifndef _TCL @@ -128,12 +128,6 @@ 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 . @@ -144,7 +138,13 @@ extern "C" { * prior Tcl releases. */ -#include <stdio.h> +#if 1 +# ifndef NULL +# define NULL ((void *) 0) +# endif +#else +# include <stdio.h> +#endif /* * Support for functions with a variable number of arguments. |