gst/gstregistrybinary.c: Wrap multi-line macros in G_STMT_{START|END}.

Original commit message from CVS:
* gst/gstregistrybinary.c: (unpack_element), (unpack_const_string),
(unpack_string)::
Wrap multi-line macros in G_STMT_{START|END}.

diff --git a/ChangeLog b/ChangeLog
index 9e1ccf0..154d77a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-27  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+       * gst/gstregistrybinary.c: (unpack_element), (unpack_const_string),
+         (unpack_string)::
+         Wrap multi-line macros in G_STMT_{START|END}.
+
 2008-12-20  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
        * docs/gst/gstreamer-sections.txt:

diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c
index 75dbc3a..a1a21ef 100644 (file)
--- a/gst/gstregistrybinary.c
+++ b/gst/gstregistrybinary.c
@@ -74,17 +74,20 @@
 
 /* macros */
 
-#define unpack_element(_inptr, _outptr, _element)  \
+#define unpack_element(_inptr, _outptr, _element)  G_STMT_START{ \
   _outptr = (_element *) _inptr; \
-  _inptr += sizeof (_element)
+  _inptr += sizeof (_element); \
+}G_STMT_END
 
-#define unpack_const_string(_inptr, _outptr) \
+#define unpack_const_string(_inptr, _outptr) G_STMT_START{\
   _outptr = g_intern_string ((const gchar *)_inptr); \
-  _inptr += strlen(_outptr) + 1
+  _inptr += strlen(_outptr) + 1; \
+}G_STMT_END
 
-#define unpack_string(_inptr, _outptr)  \
+#define unpack_string(_inptr, _outptr)  G_STMT_START{\
   _outptr = g_strdup ((gchar *)_inptr); \
-  _inptr += strlen(_outptr) + 1
+  _inptr += strlen(_outptr) + 1; \
+}G_STMT_END
 
 #define ALIGNMENT            (sizeof (void *))
 #define alignment(_address)  (gsize)_address%ALIGNMENT