Merge #12573: Fix compilation when compiler do not support __builtin_clz*

laanwj · laanwj · commit cbc1fcf576cd · 2018-03-05T18:38:17.000+01:00
1830784 Consensus: Fix bug when compiler do not support __builtin_clz* (532479301) Pull request description: #ifdef is not correct since defination is defined to 0 or 1. Should change to #if Tree-SHA512: ba13a591d28f4d7d6ebaab081be4304c43766a611226f8d2994c8db415dfcf318e82217d26a8c4af290760c68eded9503b39535b0e6e079ded912e6a8fca5b36
diff --git a/src/crypto/common.h b/src/crypto/common.h
@@ -82,12 +82,12 @@ void static inline WriteBE64(unsigned char* ptr, uint64_t x)
 /** Return the smallest number n such that (x >> n) == 0 (or 64 if the highest bit in x is set. */
 uint64_t static inline CountBits(uint64_t x)
 {
-#ifdef HAVE_DECL___BUILTIN_CLZL
+#if HAVE_DECL___BUILTIN_CLZL
     if (sizeof(unsigned long) >= sizeof(uint64_t)) {
         return x ? 8 * sizeof(unsigned long) - __builtin_clzl(x) : 0;
     }
 #endif
-#ifdef HAVE_DECL___BUILTIN_CLZLL
+#if HAVE_DECL___BUILTIN_CLZLL
     if (sizeof(unsigned long long) >= sizeof(uint64_t)) {
         return x ? 8 * sizeof(unsigned long long) - __builtin_clzll(x) : 0;
     }

Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,12 @@ void static inline WriteBE64(unsigned char* ptr, uint64_t x)`
`82`	`82`	`/** Return the smallest number n such that (x >> n) == 0 (or 64 if the highest bit in x is set. */`
`83`	`83`	`uint64_t static inline CountBits(uint64_t x)`
`84`	`84`	`{`
`85`		`-#ifdef HAVE_DECL___BUILTIN_CLZL`
	`85`	`+#if HAVE_DECL___BUILTIN_CLZL`
`86`	`86`	`if (sizeof(unsigned long) >= sizeof(uint64_t)) {`
`87`	`87`	`return x ? 8 * sizeof(unsigned long) - __builtin_clzl(x) : 0;`
`88`	`88`	`}`
`89`	`89`	`#endif`
`90`		`-#ifdef HAVE_DECL___BUILTIN_CLZLL`
	`90`	`+#if HAVE_DECL___BUILTIN_CLZLL`
`91`	`91`	`if (sizeof(unsigned long long) >= sizeof(uint64_t)) {`
`92`	`92`	`return x ? 8 * sizeof(unsigned long long) - __builtin_clzll(x) : 0;`
`93`	`93`	`}`