summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-09-29 08:14:53 (GMT)
committerAndreas Schneider <asn@cryptomilk.org>2016-10-03 16:05:00 (GMT)
commit93d9b7748298a00e0fc42190072db16d678eb974 (patch)
tree3165c4fbab0a3e5bf2c90128e6cf882b8a43c379
parentb3ba4736579f9c4ac1ea746469233b1fdfd0cd8f (diff)
downloadcmocka-93d9b7748298a00e0fc42190072db16d678eb974.zip
cmocka-93d9b7748298a00e0fc42190072db16d678eb974.tar.gz
cmocka-93d9b7748298a00e0fc42190072db16d678eb974.tar.bz2
This patch allows cmocka to be run under windows 64-bit
In that system while the maximum word size is 64-bits, the 'unsigned long int' type is only 32-bits. Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--include/cmocka.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/cmocka.h b/include/cmocka.h
index 4be40ea..72d6ae2 100644
--- a/include/cmocka.h
+++ b/include/cmocka.h
@@ -71,7 +71,7 @@ int __stdcall IsDebuggerPresent();
typedef uintmax_t LargestIntegralType;
#else /* DOXGEN */
#ifndef LargestIntegralType
-# if __WORDSIZE == 64
+# if __WORDSIZE == 64 && !defined(_WIN64)
# define LargestIntegralType unsigned long int
# else
# define LargestIntegralType unsigned long long int