From aa5429b146778774bfc447513e15c08126877653 Mon Sep 17 00:00:00 2001
From: stwo <stwo>
Date: Mon, 8 Sep 2014 00:37:22 +0000
Subject: Change one '#ifdef' to '#if defined()' for improved consistency
 within the file, as in checkin [211aa43013].

---
 unix/tclUnixCompat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 0fc51b7..3d2b7b8 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -370,7 +370,7 @@ TclpGetGrNam(
 #else
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
 
-#ifdef HAVE_GETGRNAM_R_5
+#if defined(HAVE_GETGRNAM_R_5)
     struct group *grPtr = NULL;
 
     /*
-- 
cgit v0.12


From 186cc4a17e82ce9bd90edccc45ab943c63b40c30 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Wed, 10 Sep 2014 08:20:46 +0000
Subject: [2486824] Improve error message; not all that upvars is an upvar.

---
 generic/tclVar.c |  9 ++++-----
 tests/upvar.test | 11 +++++++----
 tests/var.test   |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/generic/tclVar.c b/generic/tclVar.c
index fda5ff5..a6f6cf4 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3605,9 +3605,8 @@ ObjMakeUpvar(
 			|| !HasLocalVars(varFramePtr)
 			|| (strstr(TclGetString(myNamePtr), "::") != NULL))) {
 	    Tcl_AppendResult((Tcl_Interp *) iPtr, "bad variable name \"",
-		    TclGetString(myNamePtr), "\": upvar won't create "
-		    "namespace variable that refers to procedure variable",
-		    NULL);
+		    TclGetString(myNamePtr), "\": can't create namespace "
+		    "variable that refers to procedure variable", NULL);
 	    return TCL_ERROR;
 	}
     }
@@ -3705,8 +3704,8 @@ TclPtrObjMakeUpvar(
 		 */
 
 		Tcl_AppendResult((Tcl_Interp *) iPtr, "bad variable name \"",
-			myName, "\": upvar won't create a scalar variable "
-			"that looks like an array element", NULL);
+			myName, "\": can't create a scalar variable that "
+			"looks like an array element", NULL);
 		return TCL_ERROR;
 	    }
 	}
diff --git a/tests/upvar.test b/tests/upvar.test
index 79c2d53..d18fd3b 100644
--- a/tests/upvar.test
+++ b/tests/upvar.test
@@ -17,7 +17,7 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 }
 
 testConstraint testupvar [llength [info commands testupvar]]
-
+
 test upvar-1.1 {reading variables with upvar} {
     proc p1 {a b} {set c 22; set d 33; p2}
     proc p2 {} {upvar a x1 b x2 c x3 d x4; set a abc; list $x1 $x2 $x3 $x4 $a}
@@ -332,7 +332,7 @@ test upvar-8.9 {upvar won't create namespace variable that refers to procedure v
         unset ::test_ns_1::a
     }
     list [catch {MakeLink 1} msg] $msg
-} {1 {bad variable name "a": upvar won't create namespace variable that refers to procedure variable}}
+} {1 {bad variable name "a": can't create namespace variable that refers to procedure variable}}
 test upvar-8.10 {upvar will create element alias for new array element} {
     catch {unset upvarArray}
     array set upvarArray {}
@@ -583,8 +583,11 @@ test upvar-NS-3.3 {CompileWord OBOE} -setup {
 } -cleanup {
     rename linenumber {}
 } -result 1
-
-
+
 # cleanup
 ::tcltest::cleanupTests
 return
+
+# Local Variables:
+# mode: tcl
+# End:
diff --git a/tests/var.test b/tests/var.test
index 45b7207..c852ca9 100644
--- a/tests/var.test
+++ b/tests/var.test
@@ -275,7 +275,7 @@ test var-3.11 {MakeUpvar, my var looks like array elem} -body {
     catch {unset aaaaa}
     set aaaaa 789789
     upvar #0 aaaaa foo(bar)
-} -returnCodes 1 -result {bad variable name "foo(bar)": upvar won't create a scalar variable that looks like an array element}
+} -returnCodes 1 -result {bad variable name "foo(bar)": can't create a scalar variable that looks like an array element}
 
 test var-4.1 {Tcl_GetVariableName, global variable} testgetvarfullname {
     catch {unset a}
-- 
cgit v0.12