diff options
| author | nijtmans <nijtmans> | 2010-05-25 10:37:18 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-05-25 10:37:18 (GMT) |
| commit | 91f4c8d809190b7d786541a6119abec5cb11e846 (patch) | |
| tree | cdf9afd1b63f56b3eefdd624b8462c8c66b6af50 | |
| parent | 21140acd90b510305ba98e94fadecbdcf73d4f86 (diff) | |
| download | tcl-91f4c8d809190b7d786541a6119abec5cb11e846.zip tcl-91f4c8d809190b7d786541a6119abec5cb11e846.tar.gz tcl-91f4c8d809190b7d786541a6119abec5cb11e846.tar.bz2 | |
[Bug 2991415]: tclport.h #included before limits.h
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tclInt.h | 9 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 10 | ||||
| -rw-r--r-- | win/tclWinPort.h | 10 |
4 files changed, 17 insertions, 18 deletions
@@ -1,3 +1,9 @@ +2010-05-25 Jan Nijtmans <nijtmans@users.sf.net> + + * unix/tclUnixPort.h: [Bug 2991415]: tclport.h #included before limits.h + * win/tclWinPort.h + * generic/tclInt.h + 2010-05-21 Jan Nijtmans <nijtmans@users.sf.net> * tools/installData.tcl Make sure that copyDir only receives normalized diff --git a/generic/tclInt.h b/generic/tclInt.h index 9aa4da2..7e49ad0 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.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: tclInt.h,v 1.362.2.11 2010/01/31 23:51:36 nijtmans Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.362.2.12 2010/05/25 10:37:18 nijtmans Exp $ */ #ifndef _TCLINT @@ -40,11 +40,6 @@ #include <stdio.h> #include <ctype.h> -#ifdef NO_LIMITS_H -# include "../compat/limits.h" -#else -# include <limits.h> -#endif #ifdef NO_STDLIB_H # include "../compat/stdlib.h" #else @@ -62,7 +57,7 @@ typedef int ptrdiff_t; #endif /* - * Ensure WORDS_BIGENDIAN is defined correcly: + * Ensure WORDS_BIGENDIAN is defined correctly: * Needs to happen here in addition to configure to work with fat compiles on * Darwin (where configure runs only once for multiple architectures). */ diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 2da95b5..87344e0 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.65 2008/03/11 22:26:27 das Exp $ + * RCS: @(#) $Id: tclUnixPort.h,v 1.65.2.1 2010/05/25 10:37:18 nijtmans Exp $ */ #ifndef _TCLUNIXPORT @@ -104,6 +104,11 @@ typedef off_t Tcl_SeekOffset; #if HAVE_INTTYPES_H # include <inttypes.h> #endif +#ifdef NO_LIMITS_H +# include "../compat/limits.h" +#else +# include <limits.h> +#endif #if HAVE_STDINT_H # include <stdint.h> #endif @@ -627,10 +632,9 @@ EXTERN int pthread_getattr_np _ANSI_ARGS_((pthread_t, pthread_attr_t *)); * known-to-be-MT-unsafe library calls. * Instead of returning pointers to the * static storage, those return pointers - * to the TSD data. + * to the TSD data. */ -#include <pwd.h> #include <grp.h> MODULE_SCOPE struct passwd* TclpGetPwNam(const char *name); diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 1063b88..9f734be 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinPort.h,v 1.50.2.2 2010/04/19 07:40:41 nijtmans Exp $ + * RCS: @(#) $Id: tclWinPort.h,v 1.50.2.3 2010/05/25 10:37:18 nijtmans Exp $ */ #ifndef _TCLWINPORT @@ -57,6 +57,7 @@ #include <process.h> #include <signal.h> #include <string.h> +#include <limits.h> #ifdef __CYGWIN__ # include <unistd.h> @@ -404,13 +405,6 @@ # define environ _environ #endif /* __BORLANDC__ */ -#ifdef __CYGWIN__ -/* On Cygwin, the environment is imported from the Cygwin DLL. */ -# define putenv TclCygwinPutenv -# define timezone _timezone -#endif /* __CYGWIN__ */ - - #ifdef __WATCOMC__ /* * OpenWatcom uses a wine derived winsock2.h that is missing the |