Remove unused @MAN2TCLFLAGS@

Move <limits.h> include from
tclInt.h to tclWinPort.h, and
eliminate unneeded <stdlib.h>, <stdio.h> and
<string.h>, which are already in tclInt.h
Move "tclInt.h" from regcustom.h
up to regex.h.
tclAlloc.c: Unneeded <stdio.h> include
tclExecute.c: Fix gcc warning: comparison between signed and unsigned

9 files changed, 43 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 4148c5d..4146def 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-04-28  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/Makefile.in      Remove unused @MAN2TCLFLAGS@
+	* win/tclWinPort.h     Move <limits.h> include from
+	* generic/tclInt.h     tclInt.h to tclWinPort.h, and
+	* generic/tclEnv.c     eliminate unneeded <stdlib.h>,
+	<stdio.h> and <string.h>, which are already in
+	tclInt.h
+	* generic/regcustom.h  Move "tclInt.h" from regcustom.h
+	* generic/regex.h      up to regex.h.
+	* generic/tclAlloc.c   Unneeded <stdio.h> include
+	* generic/tclExecute.c Fix gcc warning: comparison between
+	signed and unsigned
+
 2010-04-28  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tclInt.h (TclIsVarDirectUnsettable): Corrected flags so that
diff --git a/generic/regcustom.h b/generic/regcustom.h
index 2f30ffd..bc8c28c 100644
--- a/generic/regcustom.h
+++ b/generic/regcustom.h
@@ -30,7 +30,7 @@
  * Headers if any.
  */
 
-#include "tclInt.h"
+#include "regex.h"
 
 /*
  * Overrides for regguts.h definitions, if any.
@@ -155,7 +155,9 @@ typedef int celt;		/* Type to hold chr, or NOCELT */
 #endif
 
 /*
- * And pick up the standard header.
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
  */
-
-#include "regex.h"
diff --git a/generic/regex.h b/generic/regex.h
index f6d4eb4..d6d46ce 100644
--- a/generic/regex.h
+++ b/generic/regex.h
@@ -1,5 +1,8 @@
 #ifndef _REGEX_H_
 #define	_REGEX_H_	/* never again */
+
+#include "tclInt.h"
+
 /*
  * regular expressions
  *
@@ -319,3 +322,11 @@ MODULE_SCOPE size_t regerror(int, __REG_CONST regex_t *, char *, size_t);
 #endif
 
 #endif
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index d1b8409..ebb6898 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.29 2010/02/24 10:32:17 dkf Exp $
+ * RCS: @(#) $Id: tclAlloc.c,v 1.30 2010/04/28 11:50:54 nijtmans Exp $
  */
 
 /*
@@ -142,7 +142,6 @@ static int allocInit = 0;
  */
 
 static	unsigned int numMallocs[NBUCKETS+1];
-#include <stdio.h>
 #endif
 
 #if defined(DEBUG) || defined(RCHECK)
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 87fb3d7..a64d38d 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -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: tclEnv.c,v 1.42 2010/03/05 14:34:04 dkf Exp $
+ * RCS: @(#) $Id: tclEnv.c,v 1.43 2010/04/28 11:50:54 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -755,13 +755,13 @@ TclCygwinPutenv(
 
 	if (strcmp(name, "Path") == 0) {
 #ifdef __WIN32__
-	    SetEnvironmentVariable("PATH", NULL);
+	    SetEnvironmentVariableA("PATH", NULL);
 #endif
 	    unsetenv("PATH");
 	}
 
 #ifdef __WIN32__
-	SetEnvironmentVariable(name, value);
+	SetEnvironmentVariableA(name, value);
 #endif
     } else {
 	char *buf;
@@ -771,7 +771,7 @@ TclCygwinPutenv(
 	 */
 
 #ifdef __WIN32__
-	SetEnvironmentVariable("Path", NULL);
+	SetEnvironmentVariableA("Path", NULL);
 #endif
 	unsetenv("Path");
 
@@ -786,7 +786,7 @@ TclCygwinPutenv(
 	}
 
 #ifdef __WIN32__
-	SetEnvironmentVariable(name, buf);
+	SetEnvironmentVariableA(name, buf);
 #endif
     }
 }
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 44988ae..04c47f4 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -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: tclExecute.c,v 1.480 2010/04/28 10:50:34 dkf Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.481 2010/04/28 11:50:53 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -5081,7 +5081,7 @@ TclExecuteByteCode(
 		     * Quickly force large right shifts to 0 or -1.
 		     */
 
-		    if (l2 >= CHAR_BIT*sizeof(long)) {
+		    if (l2 >= (long)(CHAR_BIT*sizeof(long))) {
 			/*
 			 * We assume that INT_MAX is much larger than the
 			 * number of bits in a long. This is a pretty safe
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 55d6f07..3ca58d7 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -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: tclInt.h,v 1.472 2010/04/28 10:50:37 dkf Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.473 2010/04/28 11:50:53 nijtmans Exp $
  */
 
 #ifndef _TCLINT
@@ -42,11 +42,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
diff --git a/win/Makefile.in b/win/Makefile.in
index 06c1789..ac40e13 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.176 2010/04/14 22:58:37 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.177 2010/04/28 11:50:54 nijtmans Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -90,9 +90,6 @@ COMPILE_DEBUG_FLAGS =
 #COMPILE_DEBUG_FLAGS = -DTCL_COMPILE_DEBUG
 #COMPILE_DEBUG_FLAGS = -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
 
-# Special compiler flags to use when building man2tcl on Windows.
-MAN2TCLFLAGS =		@MAN2TCLFLAGS@
-
 SRC_DIR			= @srcdir@
 ROOT_DIR		= @srcdir@/..
 TOP_DIR			= $(shell cd @srcdir@/..; pwd)
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 204181f..fa049bf 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.56 2010/04/15 13:58:44 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.57 2010/04/28 11:50:54 nijtmans Exp $
  */
 
 #ifndef _TCLWINPORT
@@ -56,15 +56,13 @@
 
 #include <wchar.h>
 #include <io.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <float.h>
 #include <malloc.h>
 #include <process.h>
 #include <signal.h>
-#include <string.h>
+#include <limits.h>
 
 #ifdef __CYGWIN__
 #   include <unistd.h>
@@ -413,8 +411,6 @@
 #endif /* __BORLANDC__ */
 
 #ifdef __CYGWIN__
-/* On Cygwin, the environment is imported from the Cygwin DLL. */
-#   define putenv TclCygwinPutenv
 #   define timezone _timezone
 #endif /* __CYGWIN__ */