diff --git a/Lib/tcl/tcl8.swg b/Lib/tcl/tcl8.swg
index f8575da47..c2a778abe 100644
--- a/Lib/tcl/tcl8.swg
+++ b/Lib/tcl/tcl8.swg
@@ -139,13 +139,13 @@
 
 %typemap(out) long long {
   char temp[256]; 
-  sprintf(temp,"%lld", $1);
+  sprintf(temp,"%lld", (long long) $1);
   Tcl_SetObjResult(interp,Tcl_NewStringObj(temp,-1));
 }
 
 %typemap(out) unsigned long long {
   char temp[256]; 
-  sprintf(temp,"%llu", $1);
+  sprintf(temp,"%llu", (unsigned long long) $1);
   Tcl_SetObjResult(interp,Tcl_NewStringObj(temp,-1));
 }
 
@@ -376,11 +376,9 @@
 }
 
 %typemap(varin) SWIGTYPE * {
-  void *temp;
-  if (SWIG_ConvertPtr($input,&temp,$1_descriptor, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN) != TCL_OK) {
+  if (SWIG_ConvertPtr($input,(void **)&$1,$1_descriptor, SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN) != TCL_OK) {
     return (char*)"Type error. Expected $1_ltype";
   }
-  $1 = ($1_type) temp;
 }
 
 %typemap(varin) void * {