Added Johan's changes

diff --git a/mach/proto/as/comm0.h b/mach/proto/as/comm0.h
index 10b223e..4ae94aa 100644 (file)
--- a/mach/proto/as/comm0.h
+++ b/mach/proto/as/comm0.h
@@ -111,7 +111,7 @@ _include    <signal.h>
 #define        lowb(z)         ((int)(z) & 0xFF)
 #define        loww(z)         ((int)(z) & 0xFFFF)
 
-#define        fitb(x)         ((((x) + 0x80) & ~(valu_t)0xFF) == 0)
+#define        fitb(x)         ((((x) + 0x80) & ~((int)0xFF)) == 0)
 #define        fitw(x)         ((((x) + 0x8000L) & ~0xFFFFL) == 0)
 
 #define        fit(x)          if (!(x)) nofit()

diff --git a/mach/proto/as/comm6.c b/mach/proto/as/comm6.c
index 5a9a554..cc86c4f 100644 (file)
--- a/mach/proto/as/comm6.c
+++ b/mach/proto/as/comm6.c
@@ -346,7 +346,9 @@ valu_t valu;
        outname.on_foff = new_string(name);
        outname.on_type = type;
        outname.on_desc = desc;
-       outname.on_valu = valu & ~(((0xFFFFFFFF)<<(4*sizeof(valu_t)))<<(4*sizeof(valu_t)));
+       outname.on_valu = valu;
+       if (sizeof(valu) != sizeof(long))
+               outname.on_valu &= ~(((0xFFFFFFFF)<<(4*sizeof(valu_t)))<<(4*sizeof(valu_t)));
        wr_name(&outname, 1);
 }