Fix compilation issues in svm1 build.

diff --git a/src/microcode/svm1-interp.c b/src/microcode/svm1-interp.c
index 80c75a9d3965b796571d0f353588c0c657831ff3..1b7b319c50b562f1e4f224af26b638494f5ae84a 100644 (file)
--- a/src/microcode/svm1-interp.c
+++ b/src/microcode/svm1-interp.c
@@ -31,6 +31,11 @@ USA.
 #include "fixnum.h"
 #include "svm1-defns.h"
 #include "cmpintmd/svm1.h"
+
+#undef not
+#undef and
+#undef or
+#undef xor
 \f
 #ifndef __GNUC__
 #  define GNUC_PREREQ(x, y) 0
@@ -1285,8 +1290,9 @@ DEFINE_BINARY_WR (xor, XOR, OP_XOR)
 DEFINE_INST (lsh)
 {
   DECODE_SVM1_INST_LSH (target, source1, source2);
-  long n = (TO_SIGNED (WREG_REF (source2)));
-  WREG_SET (target, FIXNUM_LSH((WREG_REF (source1)), n));
+  long n1 = (TO_SIGNED (WREG_REF (source1)));
+  long n2 = (TO_SIGNED (WREG_REF (source2)));
+  WREG_SET (target, FIXNUM_LSH(n1, n2));
   NEXT_PC;
 }