C++Builder compatibility of new Expat code

Source commit: 16c6071fbd202b3531fa3e83e587208021f9380e

libs/expat/lib/siphash.h

@@ -159,10 +159,10 @@ static void sip_round(struct siphash *H, const int rounds) {
 
 
 static struct siphash *sip24_init(struct siphash *H, const struct sipkey *key) {
-	H->v0 = 0x736f6d6570736575UL ^ key->k[0];
-	H->v1 = 0x646f72616e646f6dUL ^ key->k[1];
-	H->v2 = 0x6c7967656e657261UL ^ key->k[0];
-	H->v3 = 0x7465646279746573UL ^ key->k[1];
+	H->v0 = 0x736f6d6570736575ULL ^ key->k[0];
+	H->v1 = 0x646f72616e646f6dULL ^ key->k[1];
+	H->v2 = 0x6c7967656e657261ULL ^ key->k[0];
+	H->v3 = 0x7465646279746573ULL ^ key->k[1];
 
 	H->p = H->buf;
 	H->c = 0;

libs/expat/lib/xmlparse.c

@@ -833,7 +833,7 @@ generate_hash_secret_salt(XML_Parser parser)
     return ENTROPY_DEBUG("fallback(4)", entropy * 2147483647);
   } else {
     return ENTROPY_DEBUG("fallback(8)",
-        entropy * (unsigned long)2305843009213693951);
+        entropy * (unsigned long)2305843009213693951ULL);
   }
 #endif
 }