diff options
| -rw-r--r-- | intern/guardedalloc/MEM_sys_types.h | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 4 | ||||
| -rw-r--r-- | source/blender/blenloader/BLO_sys_types.h | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h index 01ddddb73a0..764d7c6cfa2 100644 --- 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 6eeae07cb1b..5ef0491c03c 100644 --- 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 800ae834b59..20d211a74c1 100644 --- 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; |