Pat's patch about callframe id type, strtoll casting and errno applied.

3 files changed, 6 insertions, 9 deletions

diff --git a/README b/README
index cb66bf4..6cfe877 100644
--- a/README
+++ b/README
@@ -7,13 +7,12 @@ Copyright (C) 2005 Salvatore Sanfilippo
 All Rights Reserved
 This software is under the APACHE 2.0 LICENSE
 
-CREDITS
+CREDITS (people that contributed source code/patches/ideas)
 
-- Pat Thoyts that contributed WIN32/MVC portablity fixes.
-- Clemens Hintze for fixes, suggestions, a better implementation
-  of the [if] command.
+- Pat Thoyts
+- Clemens Hintze
 
-THANKS
+ALSO THANKS TO:
 
 - Many people on the Tclers Chat that helped me to explore issues
   about the use and the implementation of the Tcl programming language.
diff --git a/jim.c b/jim.c
index 7762fac..b9e03c6 100644
--- a/jim.c
+++ b/jim.c
@@ -27,8 +27,6 @@
 #include <errno.h>
 #include <time.h>
 
-extern int errno;
-
 #include "jim.h"
 
 #ifdef HAVE_BACKTRACE
@@ -117,7 +115,7 @@ static jim_wide Jim_Strtoll(const char *nptr, char **endptr, register int base)
 	qbase = (unsigned)base;
 	cutoff = neg ? (unsigned jim_wide)-(LLONG_MIN + LLONG_MAX) + LLONG_MAX
 	    : LLONG_MAX;
-	cutlim = cutoff % qbase;
+	cutlim = (int)(cutoff % qbase);
 	cutoff /= qbase;
 	for (acc = 0, any = 0;; c = *s++) {
 		if (!isascii(c))
diff --git a/jim.h b/jim.h
index f62ae94..269590d 100644
--- a/jim.h
+++ b/jim.h
@@ -292,7 +292,7 @@ typedef struct Jim_ObjType {
 
 /* Call frame */
 typedef struct Jim_CallFrame {
-	unsigned int id; /* Call Frame ID. Used for caching. */
+	unsigned jim_wide id; /* Call Frame ID. Used for caching. */
 	struct Jim_HashTable vars;
 	struct Jim_CallFrame *parentCallFrame;
 	Jim_Obj **argv; /* object vector of the current procedure call. */