One last 64bit change, skip all this long long malarkey when we're on 64bit procs

diff --git a/ext/hash/hash_sha.c b/ext/hash/hash_sha.c
index 4bb4486d89b785a2d223cb80fe528b975968f164..ba8cfb3ffe15dae2d98c2071cb5283b1d77f3a58 100644 (file)
--- a/ext/hash/hash_sha.c
+++ b/ext/hash/hash_sha.c
@@ -22,10 +22,14 @@
 #include "php_hash.h"
 #include "php_hash_sha.h"
 
-#ifdef PHP_WIN32
-#define L64(n) (n##i64)
+#if defined(SIZEOF_LONG) && SIZEOF_LONG >= 8
+#define L64(n) (n)
 #else
+# ifdef PHP_WIN32
+#define L64(n) (n##i64)
+# else
 #define L64(n) (n##LL)
+# endif
 #endif
 
 static unsigned char PADDING[128] =

diff --git a/ext/hash/php_hash_sha.h b/ext/hash/php_hash_sha.h
index 020467506cd9cd0547e64033ca39c29bfe2439d7..7ff2094125c84bf766b1c43fedf45a6fa1e874bd 100644 (file)
--- a/ext/hash/php_hash_sha.h
+++ b/ext/hash/php_hash_sha.h
@@ -61,10 +61,14 @@ PHP_HASH_API void PHP_SHA256Init(PHP_SHA256_CTX *);
 PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX *, const unsigned char *, unsigned int);
 PHP_HASH_API void PHP_SHA256Final(unsigned char[32], PHP_SHA256_CTX *);
 
-#ifdef PHP_WIN32
-typedef unsigned __int64 php_hash_uint64;
+#if defined(SIZEOF_LONG) && SIZEOF_LONG >= 8
+typedef unsigned long php_hash_uint64;
 #else
+# ifdef PHP_WIN32
+typedef unsigned __int64 php_hash_uint64;
+# else
 typedef unsigned long long php_hash_uint64;
+# endif
 #endif
 
 /* SHA384 context */