libbonobo r3430 - in trunk: . bonobo

[bcameron svn gnome org]

Author: bcameron
Date: Mon Jan  7 19:43:37 2008
New Revision: 3430
URL: http://svn.gnome.org/viewvc/libbonobo?rev=3430&view=rev

Log:
2007-01-07  Brian Cameron  <brian cameron sun com>

        * bonobo/bonobo-arg.h: Change non-GCC version of the
          BONOBO_ARG_SET_STRING macro to remove the parens that surround
          the braces.  This syntax is a GCC extension that does not work
          with other compilers, such as Sun Studio.  FIxes bug #507129.
          Reviewed by Michael Meeks.


Modified:
   trunk/ChangeLog
   trunk/bonobo/bonobo-arg.h

Modified: trunk/bonobo/bonobo-arg.h
==============================================================================
--- trunk/bonobo/bonobo-arg.h	(original)
+++ trunk/bonobo/bonobo-arg.h	Mon Jan  7 19:43:37 2008
@@ -75,7 +75,7 @@
 #define BONOBO_ARG_SET_STRING(a,v)  ({g_assert ((a)->_type->kind == CORBA_tk_string); CORBA_free (*(char **)(a)->_value); *((CORBA_char **)((a)->_value)) = CORBA_string_dup ((v)?(v):""); })
 #else
 #define BONOBO_ARG_GET_STRING(a)    (*((CORBA_char **)((a)->_value)))
-#define BONOBO_ARG_SET_STRING(a,v)  ({CORBA_free (*(char **)(a)->_value); *((CORBA_char **)((a)->_value)) = CORBA_string_dup ((v)?(v):""); })
+#define BONOBO_ARG_SET_STRING(a,v)  {CORBA_free (*(char **)(a)->_value); *((CORBA_char **)((a)->_value)) = CORBA_string_dup ((v)?(v):""); }
 #endif
 
 BonoboArg    *bonobo_arg_new             (BonoboArgType      t);