diff options
| -rw-r--r-- | intern/cycles/util/util_cuda.h | 2 | ||||
| -rw-r--r-- | source/blender/avi/intern/avi_endian.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_cuda.h b/intern/cycles/util/util_cuda.h index d9d956b7bd9..9682f1cfe1d 100644 --- a/intern/cycles/util/util_cuda.h +++ b/intern/cycles/util/util_cuda.h @@ -38,7 +38,7 @@ CCL_NAMESPACE_END #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; diff --git a/source/blender/avi/intern/avi_endian.c b/source/blender/avi/intern/avi_endian.c index 70add8bd90f..9720d83f2c8 100644 --- a/source/blender/avi/intern/avi_endian.c +++ b/source/blender/avi/intern/avi_endian.c @@ -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)) | |