[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43017] trunk/blender: workaround for error building with clang and quiet some warnings building without libmv .

[Campbell Barton]

Revision: 43017
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43017
Author:   campbellbarton
Date:     2011-12-31 03:01:18 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
workaround for error building with clang and quiet some warnings building without libmv.

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/MEM_sys_types.h
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/blenloader/BLO_sys_types.h

Modified: trunk/blender/intern/guardedalloc/MEM_sys_types.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_sys_types.h	2011-12-31 02:40:33 UTC (rev 43016)
+++ trunk/blender/intern/guardedalloc/MEM_sys_types.h	2011-12-31 03:01:18 UTC (rev 43017)
@@ -94,7 +94,9 @@
 #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;

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-12-31 02:40:33 UTC (rev 43016)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-12-31 03:01:18 UTC (rev 43017)
@@ -1682,7 +1682,8 @@
 	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 @@
 	libmv_destroyFeatures(features);
 #else
 	(void)tracking;
+	(void)tracksbase;
 	(void)ibuf;
 	(void)framenr;
 	(void)margin;

Modified: trunk/blender/source/blender/blenloader/BLO_sys_types.h
===================================================================
--- trunk/blender/source/blender/blenloader/BLO_sys_types.h	2011-12-31 02:40:33 UTC (rev 43016)
+++ trunk/blender/source/blender/blenloader/BLO_sys_types.h	2011-12-31 03:01:18 UTC (rev 43017)
@@ -87,7 +87,8 @@
 #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;