diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-10 00:24:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-10 00:49:25 +0400 |
commit | 82628a6b0e490a180ba822336c7177cda71ba57d (patch) | |
tree | dfe4a3f7afe882da40fca593c0fcfb839c429ac9 /source/blender/blenlib | |
parent | c777f691ad427260fb39c8d191d3041169e557dd (diff) |
Code cleanup: use struct type for mempool & style edits
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_sys_types.h | 3 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_mempool.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index 8d9ed07668f..fcdbf16871a 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -197,9 +197,6 @@ typedef uint64_t u_int64_t; #endif /* ifdef platform for types */ - -/* note: use of (int, TRUE / FALSE) is deprecated, - * use (bool, true / false) instead */ #ifdef HAVE_STDBOOL_H # include <stdbool.h> #elif !defined(__bool_true_false_are_defined) && !defined(__BOOL_DEFINED) diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c index 21af8afa832..b959bec319f 100644 --- a/source/blender/blenlib/intern/BLI_mempool.c +++ b/source/blender/blenlib/intern/BLI_mempool.c @@ -143,7 +143,7 @@ static unsigned int power_of_2_max_u(unsigned int x) x = x | (x >> 2); x = x | (x >> 4); x = x | (x >> 8); - x = x | (x >>16); + x = x | (x >> 16); return x + 1; } #endif |