minor fix for glib-genmarshal



This is an old patch I have to make glib-genmarshal use G_[BEGIN,END]_DECLS
instead of #ifdef __cplusplus. It's listed as bug 52797. Okay to commit?

Ron

diff -ur -x *.o -x *.lo -x .libs -x .deps -x docs -x test gnome-cvs/glib/gobject/glib-genmarshal.c glib/gobject/glib-genmarshal.c
--- gnome-cvs/glib/gobject/glib-genmarshal.c	Wed Mar 28 14:49:28 2001
+++ glib/gobject/glib-genmarshal.c	Sun Apr  1 20:07:45 2001
@@ -588,7 +588,7 @@
     {
       if (std_includes)
 	fprintf (fout, "#include\t<gobject/gmarshal.h>\n\n");
-      fprintf (fout, "#ifdef __cplusplus\nextern \"C\" {\n#endif /* __cplusplus */\n");
+      fprintf (fout, "G_BEGIN_DECLS\n");
     }
 
   /* process input files */
@@ -671,7 +671,7 @@
   /* put out trailer */
   if (gen_cheader)
     {
-      fprintf (fout, "\n#ifdef __cplusplus\n}\n#endif /* __cplusplus */\n");
+      fprintf (fout, "\nG_END_DECLS\n");
     }
   fprintf (fout, "\n");
 




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]