From: <tho...@fr...> - 2005-10-07 12:46:03
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Fri Oct 07 2005 05:46:01 PDT Log message: * gst/gstobject.h: there's no point in wrapping FLAG_SET/_UNSET in STMT macros. Fixes compilation on Windows. Modified files: . : ChangeLog gst : gstobject.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.1629&r2=1.1630 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstobject.h.diff?r1=1.62&r2=1.63 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.1629 retrieving revision 1.1630 diff -u -d -r1.1629 -r1.1630 --- ChangeLog 7 Oct 2005 10:32:23 -0000 1.1629 +++ ChangeLog 7 Oct 2005 12:45:48 -0000 1.1630 @@ -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 <ms...@fl...> * tools/gst-inspect.c: Index: gstobject.h RCS file: /cvs/gstreamer/gstreamer/gst/gstobject.h,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- gstobject.h 2 Oct 2005 18:57:07 -0000 1.62 +++ gstobject.h 7 Oct 2005 12:45:49 -0000 1.63 @@ -146,7 +146,7 @@ * * 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 @@ * 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))) |