Code cleanup: Remove unneeded #undef's, and unneeded inclused. No change in functionality.

11 files changed, 9 insertions, 22 deletions

diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 2e5cf0b..03fe6cc 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -2167,7 +2167,7 @@ Tcl_PkgInitStubsCheck(
     const char * version,
     int exact)
 {
-    const char *actualVersion = Tcl_PkgPresent(interp, "Tcl", version, 0);
+    const char *actualVersion = Tcl_PkgPresentEx(interp, "Tcl", version, 0, NULL);
 
     if ((exact&1) && actualVersion) {
 	const char *p = version;
@@ -2179,11 +2179,11 @@ Tcl_PkgInitStubsCheck(
 	if (count == 1) {
 	    if (0 != strncmp(version, actualVersion, strlen(version))) {
 		/* Construct error message */
-		Tcl_PkgPresent(interp, "Tcl", version, 1);
+		Tcl_PkgPresentEx(interp, "Tcl", version, 1, NULL);
 		return NULL;
 	    }
 	} else {
-	    return Tcl_PkgPresent(interp, "Tcl", version, 1);
+	    return Tcl_PkgPresentEx(interp, "Tcl", version, 1, NULL);
 	}
     }
     return actualVersion;
diff --git a/generic/tclResult.c b/generic/tclResult.c
index e7cc40f..a59a704 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -615,7 +615,6 @@ Tcl_SetObjErrorCode(
  *----------------------------------------------------------------------
  */
 
-#undef Tcl_GetErrorLine
 int
 Tcl_GetErrorLine(
     Tcl_Interp *interp)
@@ -633,7 +632,6 @@ Tcl_GetErrorLine(
  *----------------------------------------------------------------------
  */
 
-#undef Tcl_SetErrorLine
 void
 Tcl_SetErrorLine(
     Tcl_Interp *interp,
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index b9efe22..158b288 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -29,10 +29,8 @@
 #undef Tcl_Alloc
 #undef Tcl_Free
 #undef Tcl_Realloc
-#undef Tcl_NewBooleanObj
 #undef Tcl_NewByteArrayObj
 #undef Tcl_NewDoubleObj
-#undef Tcl_NewIntObj
 #undef Tcl_NewListObj
 #undef Tcl_NewLongObj
 #undef Tcl_DbNewLongObj
@@ -41,15 +39,9 @@
 #undef Tcl_GetUnicode
 #undef Tcl_DumpActiveMemory
 #undef Tcl_ValidateAllMemory
-#undef Tcl_FindHashEntry
-#undef Tcl_CreateHashEntry
-#undef Tcl_Panic
-#undef Tcl_FindExecutable
 #undef Tcl_SetExitProc
 #undef Tcl_SetPanicProc
 #undef TclpGetPid
-#undef TclSockMinimumBuffers
-#undef Tcl_SetIntObj
 #undef TclStaticPackage
 #undef Tcl_BackgroundError
 #define TclStaticPackage Tcl_StaticPackage
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
index c453ae2..e255171 100644
--- a/generic/tclTestProcBodyObj.c
+++ b/generic/tclTestProcBodyObj.c
@@ -190,7 +190,7 @@ ProcBodyTestInitInternal(
 	}
     }
 
-    return Tcl_PkgProvide(interp, packageName, packageVersion);
+    return Tcl_PkgProvideEx(interp, packageName, packageVersion, NULL);
 }
 
 /*
@@ -339,7 +339,7 @@ ProcBodyTestCheckObjCmd(
 	return TCL_ERROR;
     }
 
-    version = Tcl_PkgPresent(interp, packageName, packageVersion, 1);
+    version = Tcl_PkgPresentEx(interp, packageName, packageVersion, 1, NULL);
     Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
 	    strcmp(version, packageVersion) == 0));
     return TCL_OK;
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 2863096..e7c1f90 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -4772,7 +4772,7 @@ TclZipfs_Init(
 		Tcl_NewStringObj("::tcl::zipfs::find", -1));
 	Tcl_CreateObjCommand(interp, "::tcl::zipfs::tcl_library_init",
 		ZipFSTclLibraryObjCmd, NULL, NULL);
-	Tcl_PkgProvide(interp, "zipfs", "2.0");
+	Tcl_PkgProvideEx(interp, "zipfs", "2.0", NULL);
     }
     return TCL_OK;
 #else /* !HAVE_ZLIB */
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 94cf9e8..67df8fb 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -3930,7 +3930,7 @@ TclZlibInit(
      * Formally provide the package as a Tcl built-in.
      */
 
-    return Tcl_PkgProvide(interp, "zlib", TCL_ZLIB_VERSION);
+    return Tcl_PkgProvideEx(interp, "zlib", TCL_ZLIB_VERSION, NULL);
 }
 
 /*
diff --git a/tests/compExpr-old.test b/tests/compExpr-old.test
index b466eff..634bb41 100644
--- a/tests/compExpr-old.test
+++ b/tests/compExpr-old.test
@@ -588,6 +588,7 @@ test compExpr-old-15.5 {CompileMathFuncCall: too few arguments} -body {
 test compExpr-old-15.6 {CompileMathFuncCall: missing ')'} -body {
     expr sin(1
 } -returnCodes error -match glob -result *
+
 test compExpr-old-16.1 {GetToken: checks whether integer token starting with "0x" (e.g., "0x$") is invalid} {
     catch {unset a}
     set a(VALUE) ff15
diff --git a/tests/expr-old.test b/tests/expr-old.test
index 9f9ad99..0fc13ab 100644
--- a/tests/expr-old.test
+++ b/tests/expr-old.test
@@ -941,6 +941,7 @@ test expr-old-34.15 {errors in math functions} {
 test expr-old-34.16 {errors in math functions} {
     expr round(-1.0e30)
 } -1000000000000000019884624838656
+
 test expr-old-36.1 {ExprLooksLikeInt procedure} -body {
     expr 0o289
 } -returnCodes error -match glob -result {*invalid octal number*}
diff --git a/tests/expr.test b/tests/expr.test
index cc892f3..17ea113 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -16,7 +16,6 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 }
 
 ::tcltest::loadTestedCommands
-catch [list package require -exact Tcltest [info patchlevel]]
 
 # Determine if "long int" type is a 32 bit number and if the wide
 # type is a 64 bit number on this machine.
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 111acf8..c63b485 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -8,8 +8,6 @@
  */
 
 #include "tclInt.h"
-#include <pwd.h>
-#include <grp.h>
 #include <errno.h>
 #include <string.h>
 
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index ff398be..476bac3 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -41,8 +41,6 @@
  */
 
 #include "tclInt.h"
-#include <utime.h>
-#include <grp.h>
 #ifndef HAVE_STRUCT_STAT_ST_BLKSIZE
 #ifndef NO_FSTATFS
 #include <sys/statfs.h>