merge 8.6

8 files changed, 25 insertions, 11 deletions

diff --git a/.travis.yml b/.travis.yml
index 14d651f..8712ebf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -107,7 +107,7 @@ jobs:
 # Testing on Mac, various styles
     - name: "macOS/Xcode 12/Shared"
       os: osx
-      osx_image: xcode12
+      osx_image: xcode12.2
       env:
         - BUILD_DIR=macosx
       install: []
@@ -117,9 +117,10 @@ jobs:
         - make test styles=develop
     - name: "macOS/Xcode 12/Shared/Unix-like"
       os: osx
-      osx_image: xcode12
+      osx_image: xcode12.2
       env:
         - BUILD_DIR=unix
+        - CFGOPT="--enable-dtrace"
 # Newer MacOS versions
     - name: "macOS/Xcode 12/Universal Apps/Shared"
       os: osx
@@ -360,6 +361,7 @@ jobs:
       script:
         - make dist
 before_install:
+  - touch generic/tclStubInit.c generic/tclOOStubInit.c
   - cd ${BUILD_DIR}
 install:
   - mkdir "$HOME/install dir"
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index dd83385..cc683b6 100644
--- a/generic/tclAlloc.c
+++ b/generic/tclAlloc.c
@@ -24,7 +24,7 @@
 #include "tclInt.h"
 #if !defined(TCL_THREADS) || !defined(USE_THREAD_ALLOC)
 
-#if USE_TCLALLOC
+#if defined(USE_TCLALLOC) && USE_TCLALLOC
 
 /*
  * We should really make use of AC_CHECK_TYPE(caddr_t) here, but it can wait
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index 0dc1dca..6d661f6 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -1324,7 +1324,7 @@ TclFinalizeMemorySubsystem(void)
     Tcl_MutexUnlock(ckallocMutexPtr);
 #endif
 
-#if USE_TCLALLOC
+#if defined(USE_TCLALLOC) && USE_TCLALLOC
     TclFinalizeAllocSubsystem();
 #endif
 }
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index ae40850..d8f5119 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1045,7 +1045,7 @@ TclInitSubsystems(void)
 
 	    TclInitThreadStorage();     /* Creates hash table for
 					 * thread local storage */
-#if USE_TCLALLOC
+#if defined(USE_TCLALLOC) && USE_TCLALLOC
 	    TclInitAlloc();		/* Process wide mutex init */
 #endif
 #ifdef TCL_MEM_DEBUG
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 6cdfa7e..b47035c 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -1281,7 +1281,10 @@ Tcl_GlobObjCmd(
 	    }
 	    if (dir != PATH_NONE) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"\"-directory\" cannot be used with \"-path\"", -1));
+			dir == PATH_DIR
+			    ? "\"-directory\" may only be used once"
+			    : "\"-directory\" cannot be used with \"-path\"",
+			-1));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
 			"BADOPTIONCOMBINATION", NULL);
 		return TCL_ERROR;
@@ -1306,7 +1309,10 @@ Tcl_GlobObjCmd(
 	    }
 	    if (dir != PATH_NONE) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"\"-path\" cannot be used with \"-directory\"", -1));
+			dir == PATH_GENERAL
+			    ? "\"-path\" may only be used once"
+			    : "\"-path\" cannot be used with \"-dictionary\"",
+			-1));
 		Tcl_SetErrorCode(interp, "TCL", "OPERATION", "GLOB",
 			"BADOPTIONCOMBINATION", NULL);
 		return TCL_ERROR;
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 70b2b1e..2ec5eb8 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -161,7 +161,7 @@ typedef struct PendingObjData {
 static PendingObjData pendingObjData;
 #define ObjInitDeletionContext(contextPtr) \
     PendingObjData *const contextPtr = &pendingObjData
-#elif HAVE_FAST_TSD
+#elif defined(HAVE_FAST_TSD)
 static __thread PendingObjData pendingObjData;
 #define ObjInitDeletionContext(contextPtr) \
     PendingObjData *const contextPtr = &pendingObjData
diff --git a/tests/fileName.test b/tests/fileName.test
index 725c1dd..0411ea8 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -1083,6 +1083,12 @@ test filename-11.48 {Tcl_GlobCmd} -returnCodes error -body {
 test filename-11.49 {Tcl_GlobCmd} -returnCodes error -body {
     glob -types abcde -path foo -join * *
 } -result {bad argument to "-types": abcde}
+test filename-11.50 {Tcl_GlobCmd} -returnCodes error -body {
+    glob -path hello -path salut *
+} -result {"-path" may only be used once}
+test filename-11.51 {Tcl_GlobCmd} -returnCodes error -body {
+    glob -dir hello -dir salut *
+} -result {"-directory" may only be used once}
 
 file rename $horribleglobname globTest
 file delete -force $tildeglobname
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 3d61a39..8641e5e 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -297,7 +297,7 @@ typedef DWORD_PTR * PDWORD_PTR;
  * defined in header files above.
  */
 
-#if TCL_UNION_WAIT
+#ifdef TCL_UNION_WAIT
 #   define WAIT_STATUS_TYPE union wait
 #else
 #   define WAIT_STATUS_TYPE int
@@ -439,10 +439,10 @@ typedef DWORD_PTR * PDWORD_PTR;
  * Define pid_t and uid_t if they're not already defined.
  */
 
-#if ! TCL_PID_T
+#if !defined(TCL_PID_T)
 #   define pid_t int
 #endif /* !TCL_PID_T */
-#if ! TCL_UID_T
+#if !defined(TCL_UID_T)
 #   define uid_t int
 #endif /* !TCL_UID_T */