workaround for error building with clang and quiet some warnings building without...

diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h
index 01ddddb73a04bed7168a7a249514a481c5ef334e..764d7c6cfa26a19342d1af4b0fed41a267b24866 100644 (file)
--- a/intern/guardedalloc/MEM_sys_types.h
+++ b/intern/guardedalloc/MEM_sys_types.h
@@ -94,7 +94,9 @@ typedef unsigned long uintptr_t;
 #include <stdint.h>
 
 /* XXX */
-#ifndef uint64_t
+
+#ifndef UINT64_MAX
+# define UINT64_MAX            18446744073709551615
 typedef uint8_t   u_int8_t;
 typedef uint16_t  u_int16_t;
 typedef uint32_t  u_int32_t;

diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 6eeae07cb1b86f3a8711817d5c7a1c1966642c21..5ef0491c03cd2a6a9b9a3f570a8023642c6f5e70 100644 (file)
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -1682,7 +1682,8 @@ int BKE_tracking_can_reconstruct(MovieTracking *tracking, MovieTrackingObject *o
        return 1;
 #else
        BLI_strncpy(error_msg, "Blender is compiled without motion tracking library", error_size);
-       (void) tracking;
+       (void)tracking;
+       (void)object;
 
        return 0;
 #endif
@@ -2274,6 +2275,7 @@ void BKE_tracking_detect_fast(MovieTracking *tracking, ListBase *tracksbase, ImB
        libmv_destroyFeatures(features);
 #else
        (void)tracking;
+       (void)tracksbase;
        (void)ibuf;
        (void)framenr;
        (void)margin;

diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h
index 800ae834b59c120d0e2f82d6584c5c11b51d3120..20d211a74c14865a13799f935893bb49edd22420 100644 (file)
--- a/source/blender/blenloader/BLO_sys_types.h
+++ b/source/blender/blenloader/BLO_sys_types.h
@@ -87,7 +87,8 @@ typedef unsigned long uintptr_t;
 #include <stdint.h>
 
 /* XXX */
-#ifndef uint64_t
+#ifndef UINT64_MAX
+# define UINT64_MAX            18446744073709551615
 typedef uint8_t   u_int8_t;
 typedef uint16_t  u_int16_t;
 typedef uint32_t  u_int32_t;