diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-02-13 09:03:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-13 09:40:10 +0300 |
commit | 69e9e45744b11c91626869f1ade72a07c296d387 (patch) | |
tree | df18fd4621036d7a93675ac7f63b6ceb5f3575db /intern | |
parent | 2da649cc50b552996bd790dadc27ad1af437800f (diff) |
Cleanup: macro hygiene, use parenthesis around operators
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 | ||||
-rw-r--r-- | intern/utfconv/utfconv.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 82cc11922e0..df56360b1df 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1700,7 +1700,7 @@ typedef struct WorkTile { } WorkTile; /* Pre-computed sample table sizes for PMJ02 sampler. */ -#define NUM_PMJ_SAMPLES 64 * 64 +#define NUM_PMJ_SAMPLES (64 * 64) #define NUM_PMJ_PATTERNS 48 CCL_NAMESPACE_END diff --git a/intern/utfconv/utfconv.h b/intern/utfconv/utfconv.h index 6470802bedf..36dff288966 100644 --- a/intern/utfconv/utfconv.h +++ b/intern/utfconv/utfconv.h @@ -46,11 +46,11 @@ size_t count_utf_16_from_8(const char *string8); /** * conv_utf_*** errors */ -#define UTF_ERROR_NULL_IN 1 << 0 /* Error occures when requered parameter is missing*/ -#define UTF_ERROR_ILLCHAR 1 << 1 /* Error if character is in illigal UTF rage*/ +#define UTF_ERROR_NULL_IN (1 << 0) /* Error occures when requered parameter is missing*/ +#define UTF_ERROR_ILLCHAR (1 << 1) /* Error if character is in illigal UTF rage*/ #define UTF_ERROR_SMALL \ - 1 << 2 /* Passed size is to small. It gives legal string with character missing at the end*/ -#define UTF_ERROR_ILLSEQ 1 << 3 /* Error if sequence is broken and doesn't finish*/ + (1 << 2) /* Passed size is to small. It gives legal string with character missing at the end */ +#define UTF_ERROR_ILLSEQ (1 << 3) /* Error if sequence is broken and doesn't finish*/ /** * Converts utf-16 string to allocated utf-8 string |