release: 1.3.94

[lilypond.git] / lily / include / rest-collision.hh

diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh
index 2df8ae606c05aac78013e6be03cb5c8041e1a1bd..94055324c7ea3821f86cab0050bd6800105a4fa7 100644 (file)
--- a/lily/include/rest-collision.hh
+++ b/lily/include/rest-collision.hh
@@ -14,7 +14,7 @@
 #include "lily-guile.hh"
 
 
-extern SCM Rest_collision_force_shift_callback_proc;
+
 
 /*
   Move rests in note-columns so that they do not collide.
@@ -49,7 +49,7 @@ public:
   static void add_column (Score_element*me,Score_element*);
   static void set_interface (Score_element*me);
   static bool has_interface (Score_element*);
-  static SCM force_shift_callback (SCM element, SCM axis);
+  DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM element, SCM axis));
   static SCM do_shift (Score_element*,SCM);
 };
 #endif // REST_COLLISION_HH