diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2014-01-02 08:51:04 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2014-01-02 08:51:04 (GMT) |
| commit | f918716ff4945cac9a2903bde7f3a337fee78c90 (patch) | |
| tree | 5f9901aad9a4b8761bba8e5c6d93dd76a756c617 | |
| parent | 65dd021cbcc7d9cb9941ec405dc77eb62e75239f (diff) | |
| parent | 292e2af7bb58a0e65d97b00604f9e59dc2ffa9ce (diff) | |
| download | tcl-f918716ff4945cac9a2903bde7f3a337fee78c90.zip tcl-f918716ff4945cac9a2903bde7f3a337fee78c90.tar.gz tcl-f918716ff4945cac9a2903bde7f3a337fee78c90.tar.bz2 | |
merge trunk
| -rw-r--r-- | generic/tclExecute.c | 8 | ||||
| -rw-r--r-- | unix/Makefile.in | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 4044cfb..78e09c3 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -2799,7 +2799,7 @@ TEBCresume( objPtr->internalRep.ptrAndLongRep.value = CURR_DEPTH; objPtr->length = 0; PUSH_TAUX_OBJ(objPtr); - TRACE(("=> mark depth as %d\n", CURR_DEPTH)); + TRACE(("=> mark depth as %d\n", (int) CURR_DEPTH)); NEXT_INST_F(1, 0, 0); case INST_EXPAND_DROP: @@ -5075,7 +5075,7 @@ TEBCresume( } TRACE(("\"%.20s\" \"%.20s\" => %d\n", O2S(valuePtr), O2S(value2Ptr), - (match < 0 ? -1 : match > 0 : 1 : 0))); + (match < 0 ? -1 : match > 0 ? 1 : 0))); JUMP_PEEPHOLE_F(match, 1, 2); case INST_STR_LEN: @@ -6495,8 +6495,8 @@ TEBCresume( listTmpIndex++; } } - TRACE_APPEND(("%d lists, iter %d, %s loop\n", opnd, numLists, - iterNum, (continueLoop? "continue" : "exit"))); + TRACE_APPEND(("%d lists, iter %d, %s loop\n", + numLists, iterNum, (continueLoop? "continue" : "exit"))); /* * Run-time peep-hole optimisation: the compiler ALWAYS follows diff --git a/unix/Makefile.in b/unix/Makefile.in index 71851e6..69dd14f 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1196,6 +1196,7 @@ tclLoadDld.o: $(UNIX_DIR)/tclLoadDld.c $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadDld.c tclLoadDyld.o: $(UNIX_DIR)/tclLoadDyld.c + @echo Warnings are expected from compiling tclLoadDyld.c: deprecated API use $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadDyld.c tclLoadNone.o: $(GENERIC_DIR)/tclLoadNone.c |