Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Campbell Barton
2011-12-31 03:01:18 +00:00
parent 1d152c77a5
commit 65c74f1570
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/guardedalloc/MEM_sys_types.h
View File

@@ -94,7 +94,9 @@ typedef unsigned long uintptr_t;
#include <stdint.h> #include <stdint.h>
/* XXX */ /* XXX */
#ifndef uint64_t
#ifndef UINT64_MAX
# define UINT64_MAX 18446744073709551615
typedef uint8_t u_int8_t; typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t; typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t; typedef uint32_t u_int32_t;

4
source/blender/blenkernel/intern/tracking.c
View File

@@ -1682,7 +1682,8 @@ int BKE_tracking_can_reconstruct(MovieTracking *tracking, MovieTrackingObject *o
return 1; return 1;
#else #else
BLI_strncpy(error_msg, "Blender is compiled without motion tracking library", error_size); BLI_strncpy(error_msg, "Blender is compiled without motion tracking library", error_size);
(void) tracking; (void)tracking;
(void)object;
return 0; return 0;
#endif #endif
@@ -2274,6 +2275,7 @@ void BKE_tracking_detect_fast(MovieTracking *tracking, ListBase *tracksbase, ImB
libmv_destroyFeatures(features); libmv_destroyFeatures(features);
#else #else
(void)tracking; (void)tracking;
(void)tracksbase;
(void)ibuf; (void)ibuf;
(void)framenr; (void)framenr;
(void)margin; (void)margin;

3
source/blender/blenloader/BLO_sys_types.h
View File

@@ -87,7 +87,8 @@ typedef unsigned long uintptr_t;
#include <stdint.h> #include <stdint.h>
/* XXX */ /* XXX */
#ifndef uint64_t #ifndef UINT64_MAX
# define UINT64_MAX 18446744073709551615
typedef uint8_t u_int8_t; typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t; typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t; typedef uint32_t u_int32_t;