diff options
author | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2018-05-28 23:35:59 +0300 |
commit | 5d1a172783e65a6c4c52ad112aff64d3b63d0b6c (patch) | |
tree | 02be093686847beb79d430a197ae09b4b1055a69 /source/blender/blenlib | |
parent | 66577c8732f4957e4afa5cafb18259ea589e74b6 (diff) | |
parent | 81060ff6b26c22331d2066bb83d492bbe61e936c (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index c0b76aa9cbf..75ddb5e739c 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -552,13 +552,13 @@ extern bool BLI_memory_is_zero(const void *arr, const size_t arr_size); /* UNUSED macro, for function argument */ -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) # define UNUSED(x) UNUSED_ ## x __attribute__((__unused__)) #else # define UNUSED(x) UNUSED_ ## x #endif -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) # define UNUSED_FUNCTION(x) __attribute__((__unused__)) UNUSED_ ## x #else # define UNUSED_FUNCTION(x) UNUSED_ ## x |