diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-28 00:13:59 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-28 00:13:59 +0400 |
commit | 032d83ecc411428a768e0b405fe73066dc6640ea (patch) | |
tree | f04c110b845544ca2ffab7a66c584423d769519b /source/blender/blenlib/intern | |
parent | b65c9711fef4efbb868156a490a295457a0ad69e (diff) |
style cleanup: defines with braces
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/BLI_heap.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_kdopbvh.c | 4 | ||||
-rw-r--r-- | source/blender/blenlib/intern/bpath.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/edgehash.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/noise.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/string_utf8.c | 10 |
6 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c index 0a281786100..c1175192434 100644 --- a/source/blender/blenlib/intern/BLI_heap.c +++ b/source/blender/blenlib/intern/BLI_heap.c @@ -63,7 +63,7 @@ struct Heap { { \ SWAP(int, heap->tree[i]->index, heap->tree[j]->index); \ SWAP(HeapNode *, heap->tree[i], heap->tree[j]); \ - } + } (void)0 /***/ diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index e9ee91505de..6a4ee64ebcd 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -139,7 +139,7 @@ static float KDOP_AXES[13][3] = { else break; \ } \ heap[child] = element; \ - } + } (void)0 #define POP_HEAP_BODY(HEAP_TYPE, PRIORITY, heap, heap_size) \ { \ @@ -158,7 +158,7 @@ static float KDOP_AXES[13][3] = { parent = child2; \ } \ heap[parent] = element; \ - } + } (void)0 #if 0 static int ADJUST_MEMORY(void *local_memblock, void **memblock, int new_size, int *max_size, int size_per_item) diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c index 1aba8bbeaf2..f90bb4d6152 100644 --- a/source/blender/blenlib/intern/bpath.c +++ b/source/blender/blenlib/intern/bpath.c @@ -417,7 +417,7 @@ void BLI_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int bpath_user_data); \ } \ } \ - } \ + } (void)0 { diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c index cdaf270adcb..d58ccbbd48e 100644 --- a/source/blender/blenlib/intern/edgehash.c +++ b/source/blender/blenlib/intern/edgehash.c @@ -56,7 +56,7 @@ static unsigned int _ehash_hashsizes[] = { v0 ^= v1; \ v1 ^= v0; \ v0 ^= v1; \ - } + } (void)0 /***/ diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index e01d2061743..2ff0b564592 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -992,7 +992,7 @@ static float g[512 + 2][3] = { b1 = (b0 + 1) & 255; \ r0 = t - floorf(t); \ r1 = r0 - 1.0f; \ - } + } (void)0 static float noise3_perlin(float vec[3]) diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c index 77bebfaf2e8..e9bccd4244b 100644 --- a/source/blender/blenlib/intern/string_utf8.c +++ b/source/blender/blenlib/intern/string_utf8.c @@ -178,14 +178,14 @@ static const size_t utf8_skip_data[256] = { } \ } \ *dst= '\0'; \ - } + } (void)0 char *BLI_strncpy_utf8(char *dst, const char *src, size_t maxncpy) { char *dst_r= dst; /* note: currently we don't attempt to deal with invalid utf8 chars */ - BLI_STR_UTF8_CPY(dst, src, maxncpy) + BLI_STR_UTF8_CPY(dst, src, maxncpy); return dst_r; } @@ -197,7 +197,7 @@ char *BLI_strncat_utf8(char *dst, const char *src, size_t maxncpy) maxncpy--; } - BLI_STR_UTF8_CPY(dst, src, maxncpy) + BLI_STR_UTF8_CPY(dst, src, maxncpy); return dst; } @@ -315,7 +315,7 @@ size_t BLI_strncpy_wchar_from_utf8(wchar_t *dst_w, const char *src_c, const size } \ else { \ Len = -1; \ - } + } (void)0 /* same as glib define but added an 'Err' arg */ #define UTF8_GET(Result, Chars, Count, Mask, Len, Err) \ @@ -327,7 +327,7 @@ size_t BLI_strncpy_wchar_from_utf8(wchar_t *dst_w, const char *src_c, const size } \ (Result) <<= 6; \ (Result) |= ((Chars)[(Count)] & 0x3f); \ - } + } (void)0 /* uses glib functions but not from glib */ |