Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / include / lily-guile-macros.hh

diff --git a/lily/include/lily-guile-macros.hh b/lily/include/lily-guile-macros.hh
index 8374b0e247a76ecc8dc076283352026c7036c4da..ef0db4747900b271fe9c362d06eeefe9bdbbf020 100644 (file)
--- a/lily/include/lily-guile-macros.hh
+++ b/lily/include/lily-guile-macros.hh
@@ -29,14 +29,6 @@
 
 #ifdef CACHE_SYMBOLS
 
-/* this lets us "overload" macros such as get_property to take
-   symbols as well as strings */
-inline SCM
-scm_or_str2symbol (char const *c) { return scm_str2symbol (c); }
-
-inline SCM
-scm_or_str2symbol (SCM s) { return s; }
-
 /* Using this trick we cache the value of scm_str2symbol ("fooo") where
    "fooo" is a constant string. This is done at the cost of one static
    variable per ly_symbol2scm() use, and one boolean evaluation for
@@ -51,10 +43,10 @@ scm_or_str2symbol (SCM s) { return s; }
     if (__builtin_constant_p ((x)))                                    \
       {                                                                        \
        if (!cached)                                                    \
-         value = cached = scm_gc_protect_object (scm_or_str2symbol (x)); \
+         value = cached = scm_gc_protect_object (scm_str2symbol ((x))); \
       }                                                                        \
     else                                                               \
-      value = scm_or_str2symbol (x);                                   \
+      value = scm_str2symbol ((char *) (x));                           \
     value;                                                             \
   })
 #else
@@ -158,13 +150,7 @@ ly_add_function_documentation (SCM proc, char const *fname,
 
 #define get_property(x) internal_get_property (ly_symbol2scm (x))
 #define get_object(x) internal_get_object (ly_symbol2scm (x))
-#define set_object(x, y) internal_set_object (ly_symbol2scm (x), y)
-#define del_property(x) internal_del_property (ly_symbol2scm (x))
-
-#ifndef NDEBUG
-#define set_property(x, y) internal_set_property (ly_symbol2scm (x), y, __FILE__, __LINE__, __FUNCTION__)
-#else
 #define set_property(x, y) internal_set_property (ly_symbol2scm (x), y)
-#endif
+#define set_object(x, y) internal_set_object (ly_symbol2scm (x), y)
 
 #endif /* LILY_GUILE_MACROS_HH */