From bbc5c1e36fc93e33fce4156f5064dfebe1129a57 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 20 Apr 2019 11:28:21 +0200
Subject: Cleanup: quiet extra-semicolon warning

---
 source/blender/blenkernel/BKE_collection.h     | 3 ++-
 source/blender/blenkernel/BKE_node.h           | 3 ++-
 source/blender/blenkernel/intern/particle.c    | 2 +-
 source/blender/blenkernel/intern/softbody.c    | 2 +-
 source/blender/blenkernel/intern/studiolight.c | 5 +++--
 5 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'source/blender/blenkernel')

diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index f06d9d1e64e..47786629aed 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -180,7 +180,8 @@ typedef void (*BKE_scene_collections_Cb)(struct Collection *ob, void *data);
 #define FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_END \
   } \
   } \
-  }
+  } \
+  ((void)0)
 
 #define FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(_collection, _object) \
   for (Base *_base = (Base *)BKE_collection_object_cache_get(_collection).first; _base; \
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 1f5bb2266d1..682d0b981fa 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -491,7 +491,8 @@ const char *nodeStaticSocketInterfaceType(int type, int subtype);
 #define NODE_SOCKET_TYPES_END \
   } \
   BLI_ghashIterator_free(__node_socket_type_iter__); \
-  }
+  } \
+  ((void)0)
 
 struct bNodeSocket *nodeFindSocket(struct bNode *node, int in_out, const char *identifier);
 struct bNodeSocket *nodeAddSocket(struct bNodeTree *ntree,
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 9e121d279ba..5234c2fb0ef 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3143,7 +3143,7 @@ void psys_cache_edit_paths(Depsgraph *depsgraph,
   iter_data.use_weight = use_weight;
 
   if (use_weight) {
-    ; /* use weight painting colors now... */
+    /* use weight painting colors now... */
   }
   else {
     iter_data.sel_col[0] = (float)edit->sel_col[0] / 255.0f;
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 37b6211916c..3a7c6527a50 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -3515,7 +3515,7 @@ void sbObjectStep(struct Depsgraph *depsgraph,
     return;
   }
   else if (cache_result == PTCACHE_READ_OLD) {
-    ; /* do nothing */
+    /* pass */
   }
   else if (/*ob->id.lib || */ (
       cache->flag &
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c
index df48e505f6f..b64f6a1d076 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -129,12 +129,13 @@ static const char *STUDIOLIGHT_MATCAP_DEFAULT = "basic_1.exr";
 static void studiolight_free(struct StudioLight *sl)
 {
 #define STUDIOLIGHT_DELETE_ICON(s) \
-  { \
+  do { \
     if (s != 0) { \
       BKE_icon_delete(s); \
       s = 0; \
     } \
-  }
+  } while (0)
+
   if (sl->free_function) {
     sl->free_function(sl, sl->free_function_data);
   }
-- 
cgit v1.2.3