Merge branch 'master' into translation

[lilypond.git] / lily / include / listener.hh

diff --git a/lily/include/listener.hh b/lily/include/listener.hh
index 51ad5db821d30885303cb72e9ef787b12720efb9..959f7e510f1fa8b1c3a4d309b47b398756754f8e 100644 (file)
--- a/lily/include/listener.hh
+++ b/lily/include/listener.hh
@@ -70,8 +70,13 @@ typedef struct
   bool (*equal_callback) (void *, void *);
 } Listener_function_table;
 
-class Listener
+class Listener : public Simple_smob<Listener>
 {
+public:
+  static SCM equal_p (SCM, SCM);
+  SCM mark_smob ();
+  static const char type_p_name_[];
+private:
   void *target_;
   Listener_function_table *type_;
 public:
@@ -87,7 +92,6 @@ public:
            && (*type_->equal_callback) ((void *) target_, (void *) other.target_);
   }
 
-  DECLARE_SIMPLE_SMOBS (Listener);
 };
 
 #define IMPLEMENT_LISTENER(cl, method)                  \