Merge pull request #483 from obilaniu/trivialfixes

Trivial Fixes related to #481.

Author: abergeron

src/cache/lru.c

@@ -114,15 +114,14 @@ struct _hash {
   size_t size;
 };
 
-static inline size_t roundup2(size_t s) {
+static inline unsigned long long roundup2(unsigned long long s) {
   s--;
   s |= s >> 1;
   s |= s >> 2;
   s |= s >> 4;
   s |= s >> 8;
   s |= s >> 16;
-  if (sizeof(size_t) >= 8)
-    s |= s >> 32;
+  s |= s >> 32;
   s++;
   return s;
 }

src/cache/twoq.c

@@ -124,15 +124,14 @@ struct _hash {
   size_t size;
 };
 
-static inline size_t roundup2(size_t s) {
+static inline unsigned long long roundup2(unsigned long long s) {
   s--;
   s |= s >> 1;
   s |= s >> 2;
   s |= s >> 4;
   s |= s >> 8;
   s |= s >> 16;
-  if (sizeof(size_t) >= 8)
-    s |= s >> 32;
+  s |= s >> 32;
   s++;
   return s;
 }

src/gpuarray_buffer_opencl.c

@@ -757,7 +757,7 @@ static int cl_memset(gpudata *dst, size_t offset, int data) {
                  offset, n, val);
   }
   /* If this assert fires, increase the size of local_kern above. */
-  assert(r <= sizeof(local_kern));
+  assert(r <= (int)sizeof(local_kern));
   _unused(r);
 
   sz = strlen(local_kern);

src/util/integerfactoring.c

@@ -266,7 +266,7 @@ static uint64_t gaIMulMod    (uint64_t a, uint64_t b, uint64_t m){
 	);
 
 	return r;
-#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#elif ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ >= 16
 	/* Hardcore GCC 4.6+ optimization jazz */
 	return ((unsigned __int128)a * (unsigned __int128)b) % m;
 #else