diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:36:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:36:30 +0300 |
| commit | 61d27db35967710421ab92748e09624db068258d (patch) | |
| tree | bc0a53ad97072a3bacb9cf5265abb19d0b511ecd /source/blender/blenlib/BLI_utildefines.h | |
| parent | 56173e512cab020a5bc96e6d3069641a03d47fbe (diff) | |
| parent | 5513da65b24a3ce77b1709acea841475115f3a7a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib/BLI_utildefines.h')
| -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 9c90b86832a..36281ee0fcc 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 */ -#if defined(__GNUC__) || defined(__clang__) +#if defined(__GNUC__) || defined(__clang__) # define UNUSED(x) UNUSED_ ## x __attribute__((__unused__)) #else # define UNUSED(x) UNUSED_ ## x #endif -#if defined(__GNUC__) || defined(__clang__) +#if defined(__GNUC__) || defined(__clang__) # define UNUSED_FUNCTION(x) __attribute__((__unused__)) UNUSED_ ## x #else # define UNUSED_FUNCTION(x) UNUSED_ ## x |