64-bit cleanliness: we were already carefully using a uint32 type in

the SHA code, but it wasn't correctly defined!

[originally from svn r7817]

diff --git a/puzzles.h b/puzzles.h
index 9b69d1b005b35e1644f4dabec50b41935f017de4..5c967f2c90345ae9982ecf3593adbc5b0fba0125 100644 (file)
--- a/puzzles.h
+++ b/puzzles.h
@@ -7,6 +7,7 @@
 
 #include <stdio.h>  /* for FILE */
 #include <stdlib.h> /* for size_t */
+#include <limits.h> /* for UINT_MAX */
 
 #ifndef TRUE
 #define TRUE 1
@@ -331,7 +332,14 @@ void random_free(random_state *state);
 char *random_state_encode(random_state *state);
 random_state *random_state_decode(char *input);
 /* random.c also exports SHA, which occasionally comes in useful. */
+#if __STDC_VERSION__ >= 199901L
+#include <stdint.h>
+typedef uint32_t uint32;
+#elif UINT_MAX >= 4294967295L
+typedef unsigned int uint32;
+#else
 typedef unsigned long uint32;
+#endif
 typedef struct {
     uint32 h[5];
     unsigned char block[64];