--- a/src/insdel.c	Mon Aug 13 10:25:39 2007 +0200
+++ b/src/insdel.c	Mon Aug 13 10:26:29 2007 +0200
@@ -316,9 +316,9 @@
 #  define HIGH_BIT_MASK 0x80808080U
 # else
 #  define LONG_BYTES 8
-#  define ALIGN_MASK 0xFFFFFFFFFFFFFFF8U
+#  define ALIGN_MASK 0xFFFFFFFFFFFFFFF8UL
    /* I had a dream, I was being overrun with early Intel processors ... */
-#  define HIGH_BIT_MASK 0x8080808080808080U
+#  define HIGH_BIT_MASK 0x8080808080808080UL
 # endif
 
   /* When we have a large number of bytes to scan, we can be trickier
@@ -2331,12 +2331,14 @@
       else
 	*len = XSTRING_LENGTH (reloc) - offset;
     }
+#ifdef ERROR_CHECK_BUFPOS
   assert (*len >= 0);
   if (STRINGP (reloc))
     {
       assert (offset >= 0 && offset <= XSTRING_LENGTH (reloc));
       assert (offset + *len <= XSTRING_LENGTH (reloc));
     }
+#endif
 }
 
 /* Insert a string into BUF at Bufpos POS.  The string data comes