fix machine-dependant #if's

diff --git a/lang/basic/lib/random.c b/lang/basic/lib/random.c
index e5fd178..42d5b17 100644 (file)
--- a/lang/basic/lib/random.c
+++ b/lang/basic/lib/random.c
@@ -1,5 +1,9 @@
 /* $Header$ */
 
+#if !defined(EM_WSIZE)
+#define EM_WSIZE _EM_WSIZE
+#endif
+
 _randomi()
 {
        int i;

diff --git a/lang/cem/libcc/gen/head_cc.e b/lang/cem/libcc/gen/head_cc.e
index 60e3a03..6f80dcd 100644 (file)
--- a/lang/cem/libcc/gen/head_cc.e
+++ b/lang/cem/libcc/gen/head_cc.e
@@ -44,7 +44,7 @@ _penvp
  loi EM_PSIZE
  lae _penvp
  sti EM_PSIZE
-#if unix && ! (em22 || em24 || em44)
+#if __unix && ! (__em22 || __em24 || __em44)
  lpi $_ctch_
  sig
  asp EM_PSIZE
@@ -61,7 +61,7 @@ _penvp
  cal $exit
  end
 
-#if unix && ! (em22 || em24 || em44)
+#if __unix && ! (__em22 || __em24 || __em44)
  exp $_ctch_
  pro $_ctch_,0
  lol 0

diff --git a/lang/cem/libcc/gen/malloc.c b/lang/cem/libcc/gen/malloc.c
index e7d2d8d..d7555e3 100644 (file)
--- a/lang/cem/libcc/gen/malloc.c
+++ b/lang/cem/libcc/gen/malloc.c
@@ -8,13 +8,13 @@
 #define        ASSERT(b)       /* empty */
 #endif
 
-#if EM_WSIZE == EM_PSIZE
+#if _EM_WSIZE == _EM_PSIZE
 #define        ptrint          int
 #else
 #define        ptrint          long
 #endif
 
-#if EM_PSIZE == 2
+#if _EM_PSIZE == 2
 #define BRKSIZE                1024
 #else
 #define BRKSIZE                4096

diff --git a/lang/cem/libcc/gen/rand.c b/lang/cem/libcc/gen/rand.c
index 7395bf0..d01e6c9 100644 (file)
--- a/lang/cem/libcc/gen/rand.c
+++ b/lang/cem/libcc/gen/rand.c
@@ -4,7 +4,7 @@ static long seed = 1L;
 int rand()
 {
   seed = (1103515245L * seed + 12345) & 0x7FFFFFFF;
-#if EM_WSIZE == 4
+#if _EM_WSIZE == 4
   return (int) seed;
 #else
   return ((int)(seed >> 8) & 0x7FFF);