* lily/staff-symbol-engraver.cc (acknowledge_grob): remove item ->

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

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 8ba5e10b78c53e5291b79a79160198105514228a..811858e4bbaedf577f28ac02bc9bcce1481ea129 100644 (file)
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,26 +1,26 @@
 #ifndef MISC_HH
 #define MISC_HH
 
-#include "lily-proto.hh"
+#include <stdlib.h>
+
 #include "real.hh"
-#include "moment.hh"
-#include "scalar.hh"
-#include "grouping.hh"
+#include "array.hh"
+#include "interval.hh"
+
+double log_2 (double x) ;
+int intlog2 (int d);
 
-Moment wholes(int dur, int dots);
-double log_2(double x) ;
-int intlog2(int d);
-inline int
-abs(int i){
-    return (i < 0)?-i:i;
-}
 inline int
-sign(int i) {
-    if (i<0) return -1;
-    else if (i) return 1;
-    else return 0;
+sign (int i)
+{
+  if (i<0)
+    return -1;
+  else if (i)
+    return 1;
+  else return 0;
 }
 
-Interval itemlist_width(const Array<Item*> &its);
+
 
 #endif
+