diff --git a/src/interpreter.h b/src/interpreter.h
index 2dd2f0e1458cb2a00d991a4a58de2595a3d182c6..5746a1871138f2ece1f69321840e2b049111dcd5 100644
--- a/src/interpreter.h
+++ b/src/interpreter.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: interpreter.h,v 1.85 2003/08/06 18:05:27 mast Exp $
+|| $Id: interpreter.h,v 1.86 2004/05/29 18:19:25 grubba Exp $
 */
 
 #undef LOW_GET_ARG
@@ -103,6 +103,7 @@ static int eval_instruction(PIKE_OPCODE_T *pc)
   debug_malloc_touch(Pike_fp);
   while(1)
   {
+    INT32 arg1, arg2;
     instr = pc[0];
     Pike_fp->pc = pc++;
 
@@ -151,14 +152,14 @@ static int eval_instruction(PIKE_OPCODE_T *pc)
 
 #define OPCODE0(OP, DESC, FLAGS, CODE) CASE(OP); CODE; DONE
 #define OPCODE1(OP, DESC, FLAGS, CODE) CASE(OP); { \
-    INT32 arg1=GET_ARG(); \
+    arg1=GET_ARG(); \
     FETCH; \
     CODE; \
   } DONE
 
 #define OPCODE2(OP, DESC, FLAGS, CODE) CASE(OP); { \
-    INT32 arg1=GET_ARG(); \
-    INT32 arg2=GET_ARG2(); \
+    arg1=GET_ARG(); \
+    arg2=GET_ARG2(); \
     FETCH; \
     CODE; \
   } DONE
@@ -193,14 +194,14 @@ static int eval_instruction(PIKE_OPCODE_T *pc)
  * the instruction itself.
  */
 #define OPCODE1_PTRJUMP(OP, DESC, FLAGS, CODE) CASE(OP); { \
-    INT32 arg1=GET_ARG(); \
+    arg1=GET_ARG(); \
     FETCH; \
     CODE; \
   } DONE
 
 #define OPCODE2_PTRJUMP(OP, DESC, FLAGS, CODE) CASE(OP); { \
-    INT32 arg1=GET_ARG(); \
-    INT32 arg2=GET_ARG2(); \
+    arg1=GET_ARG(); \
+    arg2=GET_ARG2(); \
     FETCH; \
     CODE; \
   } DONE