X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/b2733f8fd5234aa49bd611d261687384342103e7..06cbc317229e882f379e75eb3adf7cf9c071febd:/stadtx_hash.h

diff --git a/stadtx_hash.h b/stadtx_hash.h
index 3b5dfb6..bd09c2f 100644
--- a/stadtx_hash.h
+++ b/stadtx_hash.h
@@ -149,10 +149,10 @@ STADTX_STATIC_INLINE void stadtx_seed_state (
     /* hex expansion of pi, skipping first two digits. pi= 3.2[43f6...]*/
     /* pi value in hex from here:
      * http://turner.faculty.swau.edu/mathematics/materialslibrary/pi/pibases.html*/
-    state[0]= seed[0] ^ 0x43f6a8885a308d31UL;
-    state[1]= seed[1] ^ 0x3198a2e03707344aUL;
-    state[2]= seed[0] ^ 0x4093822299f31d00UL;
-    state[3]= seed[1] ^ 0x82efa98ec4e6c894UL;
+    state[0]= seed[0] ^ UINT64_C(0x43f6a8885a308d31);
+    state[1]= seed[1] ^ UINT64_C(0x3198a2e03707344a);
+    state[2]= seed[0] ^ UINT64_C(0x4093822299f31d00);
+    state[3]= seed[1] ^ UINT64_C(0x82efa98ec4e6c894);
     if (!state[0]) state[0]=1;
     if (!state[1]) state[1]=2;
     if (!state[2]) state[2]=4;
@@ -162,20 +162,20 @@ STADTX_STATIC_INLINE void stadtx_seed_state (
      * bits in the seed - IOW, by the time we are hashing the
      * four state vectors should be completely different and utterly
      * uncognizable from the input seed bits */
-    STADTX_SCRAMBLE64(state[0],0x801178846e899d17UL);
-    STADTX_SCRAMBLE64(state[0],0xdd51e5d1c9a5a151UL);
-    STADTX_SCRAMBLE64(state[1],0x93a7d6c8c62e4835UL);
-    STADTX_SCRAMBLE64(state[1],0x803340f36895c2b5UL);
-    STADTX_SCRAMBLE64(state[2],0xbea9344eb7565eebUL);
-    STADTX_SCRAMBLE64(state[2],0xcd95d1e509b995cdUL);
-    STADTX_SCRAMBLE64(state[3],0x9999791977e30c13UL);
-    STADTX_SCRAMBLE64(state[3],0xaab8b6b05abfc6cdUL);
+    STADTX_SCRAMBLE64(state[0],UINT64_C(0x801178846e899d17));
+    STADTX_SCRAMBLE64(state[0],UINT64_C(0xdd51e5d1c9a5a151));
+    STADTX_SCRAMBLE64(state[1],UINT64_C(0x93a7d6c8c62e4835));
+    STADTX_SCRAMBLE64(state[1],UINT64_C(0x803340f36895c2b5));
+    STADTX_SCRAMBLE64(state[2],UINT64_C(0xbea9344eb7565eeb));
+    STADTX_SCRAMBLE64(state[2],UINT64_C(0xcd95d1e509b995cd));
+    STADTX_SCRAMBLE64(state[3],UINT64_C(0x9999791977e30c13));
+    STADTX_SCRAMBLE64(state[3],UINT64_C(0xaab8b6b05abfc6cd));
 }
 
-#define STADTX_K0_U64 0xb89b0f8e1655514fUL
-#define STADTX_K1_U64 0x8c6f736011bd5127UL
-#define STADTX_K2_U64 0x8f29bd94edce7b39UL
-#define STADTX_K3_U64 0x9c1b8e1e9628323fUL
+#define STADTX_K0_U64 UINT64_C(0xb89b0f8e1655514f)
+#define STADTX_K1_U64 UINT64_C(0x8c6f736011bd5127)
+#define STADTX_K2_U64 UINT64_C(0x8f29bd94edce7b39)
+#define STADTX_K3_U64 UINT64_C(0x9c1b8e1e9628323f)
 
 #define STADTX_K2_U32 0x802910e3
 #define STADTX_K3_U32 0x819b13af
@@ -223,12 +223,10 @@ STADTX_STATIC_INLINE U64 stadtx_hash_with_state(
             /* FALLTHROUGH */
             case 4: v1 += (U64)U8TO32_LE(key);
                     break;
-            /* FALLTHROUGH */
             case 3: v0 += (U64)key[2] << 48;
             /* FALLTHROUGH */
             case 2: v1 += (U64)U8TO16_LE(key);
                     break;
-            /* FALLTHROUGH */
             case 1: v0 += (U64)key[0];
             /* FALLTHROUGH */
             case 0: v1 = ROTL64(v1, 32) ^ 0xFF;
@@ -278,22 +276,18 @@ STADTX_STATIC_INLINE U64 stadtx_hash_with_state(
             case 6: v2 += (U64)U8TO16_LE(key+4);
                     v3 += (U64)U8TO32_LE(key);
                     break;
-            /* FALLTHROUGH */
             case 5: v1 += (U64)key[4];
             /* FALLTHROUGH */
             case 4: v2 += (U64)U8TO32_LE(key);
                     break;
-            /* FALLTHROUGH */
             case 3: v3 += (U64)key[2];
             /* FALLTHROUGH */
             case 2: v1 += (U64)U8TO16_LE(key);
                     break;
-            /* FALLTHROUGH */
             case 1: v2 += (U64)key[0];
             /* FALLTHROUGH */
             case 0: v3 = ROTL64(v3, 32) ^ 0xFF;
                     break;
-            /* FALLTHROUGH */
         }
 
         v1 -= v2;