gst/gstobject.h: there's no point in wrapping FLAG_SET/_UNSET in STMT macros.

Original commit message from CVS:

* gst/gstobject.h:
there's no point in wrapping FLAG_SET/_UNSET in STMT macros.
Fixes compilation on Windows.

diff --git a/ChangeLog b/ChangeLog
index aed5ba6..28310a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-07  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst/gstobject.h:
+         there's no point in wrapping FLAG_SET/_UNSET in STMT macros.
+         Fixes compilation on Windows.
+
 2005-10-07  Michael Smith <msmith@fluendo.com>
 
        * tools/gst-inspect.c:

diff --git a/common b/common
index fb4bd52..eb0dd11 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit fb4bd52a0a6e882bd8eb0ca836edd94d3fcaea42
+Subproject commit eb0dd118a086dd4aa405d3871131839d81306245

diff --git a/gst/gstobject.h b/gst/gstobject.h
index 6979d30..c6b0e96 100644 (file)
--- a/gst/gstobject.h
+++ b/gst/gstobject.h
@@ -146,7 +146,7 @@ typedef enum
  *
  * This macro sets the given bits.
  */
-#define GST_FLAG_SET(obj,flag)          G_STMT_START{ (GST_FLAGS (obj) |= (1<<(flag))); }G_STMT_END
+#define GST_FLAG_SET(obj,flag)          (GST_FLAGS (obj) |= (1<<(flag)))
 /**
  * GST_FLAG_UNSET:
  * @obj: Object to unset flag in.
@@ -154,7 +154,7 @@ typedef enum
  *
  * This macro usets the given bits.
  */
-#define GST_FLAG_UNSET(obj,flag)        G_STMT_START{ (GST_FLAGS (obj) &= ~(1<<(flag))); }G_STMT_END
+#define GST_FLAG_UNSET(obj,flag)        (GST_FLAGS (obj) &= ~(1<<(flag)))
 
 
 /**