Re: PATCH: libbonoui missing extern "C"s

[jacob berkman <jacob ximian com>]

On Mon, 2002-04-01 at 13:14, Murray Cumming wrote:
> This patch adds some missing G_BEGIN_DECLS and G_BEGIN_ENDS to
> libbonoboui headers. We need this for bonobomm.

this broke nautilus' build; attached patch applied.

one question.  should:

    G_BEGIN_DECLS
    
    typedef struct _BonoboUIContainer BonoboUIContainer;
    
    #include <bonobo/bonobo-ui-engine.h>
    
be:

    G_BEGIN_DECLS
    
    typedef struct _BonoboUIContainer BonoboUIContainer;
    
    G_END_DECLS
    
    #include <bonobo/bonobo-ui-engine.h>
    
    G_BEGIN_DECLS

?

jacob
-- 
"don't get me wrong, i think that radiohead are amazing. i love their
 music and i love their ethos, but that thom yorke guy always seems to
 be complaining." -- moby

? ChangeLog.flc
? libbonoboui-glib-gettextize.patch
? monikers/Bonobo_Moniker_extra.server
? monikers/Bonobo_Moniker_extra.server.in
? monikers/Makefile
? monikers/Makefile.in
? samples/bonoboui-hello/Makefile
? samples/bonoboui-hello/Makefile.in
? samples/bonoboui-hello/bonoboui-hello
? tests/test-libglade-bonobo.c
? tests/test-libglade-bonobo.glade
? tests/test-libglade-gnome
? tests/test-libglade-gnome.glade2
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
retrieving revision 1.317
diff -u -r1.317 ChangeLog
--- ChangeLog	2 Apr 2002 15:22:16 -0000	1.317
+++ ChangeLog	3 Apr 2002 17:57:55 -0000
@@ -1,3 +1,8 @@
+2002-04-03  jacob berkman  <jacob ximian com>
+
+	* bonobo/bonobo-ui-container.h: include gmacros.h before using a
+	macro defined there (fixes nautilus build errors)
+
 2002-04-01  Murray Cumming  <murrayc usa net>
 
 	* bonobo/bonobo-a11y.h, bonobo/bonobo-control-internal.h,
Index: bonobo/bonobo-ui-container.h
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-container.h,v
retrieving revision 1.20
diff -u -r1.20 bonobo-ui-container.h
--- bonobo/bonobo-ui-container.h	2 Apr 2002 15:22:20 -0000	1.20
+++ bonobo/bonobo-ui-container.h	3 Apr 2002 17:57:55 -0000
@@ -10,6 +10,8 @@
 #ifndef _BONOBO_UI_CONTAINER_H_
 #define _BONOBO_UI_CONTAINER_H_
 
+#include <glib/gmacros.h>
+
 G_BEGIN_DECLS
 
 typedef struct _BonoboUIContainer BonoboUIContainer;