Adjust katze_(foo_)assign to work inside one-line if's

This commit is contained in:
Christian Dywan 2009-10-16 19:37:49 +02:00
parent 640b37e5ec
commit 3fec0a0265

View file

@ -34,11 +34,12 @@ G_BEGIN_DECLS
* Frees @lvalue if needed and assigns it the value of @rvalue. * Frees @lvalue if needed and assigns it the value of @rvalue.
**/ **/
#define katze_assign(lvalue, rvalue) \ #define katze_assign(lvalue, rvalue) \
if (1) \ do \
{ \ { \
g_free (lvalue); \ g_free (lvalue); \
lvalue = rvalue; \ lvalue = rvalue; \
} } \
while (0)
/** /**
* katze_object_assign: * katze_object_assign:
@ -48,12 +49,13 @@ G_BEGIN_DECLS
* Unrefs @lvalue if needed and assigns it the value of @rvalue. * Unrefs @lvalue if needed and assigns it the value of @rvalue.
**/ **/
#define katze_object_assign(lvalue, rvalue) \ #define katze_object_assign(lvalue, rvalue) \
if (1) \ do \
{ \ { \
if (lvalue) \ if (lvalue) \
g_object_unref (lvalue); \ g_object_unref (lvalue); \
lvalue = rvalue; \ lvalue = rvalue; \
} } \
while (0)
/** /**
* katze_strv_assign: * katze_strv_assign:
@ -65,11 +67,12 @@ G_BEGIN_DECLS
* Since: 0.1.7 * Since: 0.1.7
**/ **/
#define katze_strv_assign(lvalue, rvalue) \ #define katze_strv_assign(lvalue, rvalue) \
if (1) \ do \
{ \ { \
g_strfreev (lvalue); \ g_strfreev (lvalue); \
lvalue = rvalue; \ lvalue = rvalue; \
} } \
while (0)
GtkWidget* GtkWidget*
katze_property_proxy (gpointer object, katze_property_proxy (gpointer object,