From: Joe Neeman <joeneeman@gmail.com>
Date: Sun, 19 Nov 2006 07:58:44 +0000 (+0200)
Subject: stop GDB crashing on ly_display_scm
X-Git-Tag: release/2.11.16-1^2~16^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ae2d83d0ee27a9a9b71a21f266c429b3817ad824;p=lilypond.git

stop GDB crashing on ly_display_scm
---

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 3422089e9c..0f94e2ebbb 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -114,9 +114,7 @@ inline SCM ly_append4 (SCM x1, SCM x2, SCM x3, SCM x4)
 /*
   display and print newline.
 */
-extern "C" {
-  void ly_display_scm (SCM s);
-}
+void ly_display_scm (void *s);
 
 void read_lily_scm_file (string);
 void ly_c_init_guile ();
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index e1a0e9bffd..e932f342b7 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -114,15 +114,12 @@ gulp_file_to_string (string fn, bool must_exist, int size)
   return result;
 }
 
-extern "C" {
-  // maybe gdb 5.0 becomes quicker if it doesn't do fancy C++ typing?
-  void
-  ly_display_scm (SCM s)
-  {
-    scm_display (s, scm_current_output_port ());
-    scm_newline (scm_current_output_port ());
-  }
-};
+void
+ly_display_scm (void *s)
+{
+  scm_display ((SCM)s, scm_current_output_port ());
+  scm_newline (scm_current_output_port ());
+}
 
 string
 ly_scm2string (SCM str)