The great merge

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4141 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Lib/guile/guilemain.i

@@ -27,6 +27,10 @@
 %{
 #include <libguile.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Debugger interface (don't change the order of the following lines) */
 #define GDB_TYPE SCM
 #include <libguile/gdb_interface.h>
@@ -44,6 +48,10 @@ inner_main(void *closure, int argc, char **argv)
   /* never reached: scm_shell will perform an exit */
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 int
 main(int argc, char **argv)
 {