portability to 32-bit systems and systems without __builtin_bswap*

engine/forth.h

@@ -162,7 +162,7 @@ typedef struct {
 # ifdef HAVE___BUILTIN_BSWAP32
 #  define BSWAP16(x) __builtin_bswap32((x) << 16)
 # else
-#  define BSWAP16(x) ((((x)>>8) & 0xff) | ((x)<<8) & 0xff00)
+#  define BSWAP16(x) ((((x)>>8) & 0xff) | (((x)<<8) & 0xff00))
 # endif
 #endif
 #ifdef HAVE___BUILTIN_BSWAP32

prim

@@ -1848,7 +1848,7 @@ ukey = hashkey2a(c_addr,u) >> (8*sizeof(UCell) - ubits);
 hashkey2  ( c_addr u f a_addr -- )	gforth	hashkey2
 ""Compute a 128 bit hash key of the string c_addr u, starting with the
 key in a_addr.  If f is true, compute case insensitive.""
-hashkey2(c_addr, u, f ? 0x2020202020202020L : 0L, (hash128*)a_addr);
+hashkey2(c_addr, u, f ? 0x2020202020202020LL : 0LL, (hash128*)a_addr);
 
 \+