Revision: 53226
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53226
Author: campbellbarton
Date: 2012-12-21 03:02:36 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
patches from fedora:
blender-2.64-64bit.patch
blender-2.64a-big-endian.patch
by [email protected]
Modified Paths:
--------------
trunk/blender/intern/cycles/util/util_cuda.h
trunk/blender/source/blender/avi/intern/avi_endian.c
Modified: trunk/blender/intern/cycles/util/util_cuda.h
===================================================================
--- trunk/blender/intern/cycles/util/util_cuda.h 2012-12-21 02:49:15 UTC
(rev 53225)
+++ trunk/blender/intern/cycles/util/util_cuda.h 2012-12-21 03:02:36 UTC
(rev 53226)
@@ -38,7 +38,7 @@
#define CUDA_VERSION 3020
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) ||
defined(__LP64__)
typedef unsigned long long CUdeviceptr;
#else
typedef unsigned int CUdeviceptr;
Modified: trunk/blender/source/blender/avi/intern/avi_endian.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi_endian.c 2012-12-21
02:49:15 UTC (rev 53225)
+++ trunk/blender/source/blender/avi/intern/avi_endian.c 2012-12-21
03:02:36 UTC (rev 53226)
@@ -49,7 +49,7 @@
#ifdef __BIG_ENDIAN__
/* copied from BLI_endian_switch_inline.h */
-static void invert(int *num)
+static void invert(int *val)
{
int tval = *val;
*val = ((tval >> 24)) |
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
