Merge with master

[lilypond.git] / flower / include / guile-compatibility.hh

diff --git a/flower/include/guile-compatibility.hh b/flower/include/guile-compatibility.hh
index 78ec55575b4e666eb8b292378c27cb57bb12b702..3fe85ab9f6a2aeb5dd4ae3f08af1948a5500ad5e 100644 (file)
--- a/flower/include/guile-compatibility.hh
+++ b/flower/include/guile-compatibility.hh
@@ -1,10 +1,9 @@
-/* 
+/*
   guile-compatibility.hh -- declare compat functions for GUILE 1.6
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef GUILE_COMPATIBILITY_HH
@@ -22,9 +21,10 @@ inline SCM scm_cdr (SCM x)
 inline SCM scm_car (SCM x)
 {
   if (SCM_NCONSP (x))
-    abort ();    
+    abort ();
   return SCM_CAR (x);
 }
+#define SCM_I_CONSP(x) SCM_CONSP (x)
 inline SCM scm_caar (SCM x) { return SCM_CAAR (x); }
 inline SCM scm_cdar (SCM x) { return SCM_CDAR (x); }
 inline SCM scm_cadr (SCM x) { return SCM_CADR (x); }
@@ -37,24 +37,29 @@ inline SCM scm_cadar (SCM x) { return SCM_CADAR (x); }
 #define scm_gc_register_collectable_memory(a, b, c) scm_done_malloc (b)
 #define scm_is_vector(x) (SCM_VECTORP ((SCM) x))
 #define SCM_HASHTABLE_P(x) (SCM_VECTORP ((SCM) x))
-#define SCM_VECTOR_REF(v, i) (SCM_VELTS ((v))[(i)])
+#define SCM_VECTOR_REF(v, i) (SCM_VELTS ((v))[ (i)])
 #define scm_from_bool(x) (x ? SCM_BOOL_T : SCM_BOOL_F)
 #define scm_from_int(x) SCM_MAKINUM (x)
 #define scm_from_unsigned_integer(x) scm_uint2num (x)
+#define scm_from_unsigned(x) scm_uint2num (x)
+#define scm_from_uint32(x) scm_uint2num (x)
 #define scm_is_integer(x) SCM_INUMP (x)
 #define scm_is_string(x) SCM_STRINGP (x)
 #define scm_hash_table_p scm_vector_p
 #define scm_from_locale_stringn(s, n) scm_mem2string (s, n)
+#define scm_from_locale_string(x) scm_makfrom0str (x)
 #define scm_i_string_chars(x) SCM_STRING_CHARS (x)
 #define scm_i_string_length(x) SCM_STRING_LENGTH (x)
 inline int ly_c_number_p (SCM x) { return SCM_NUMBERP (x); }
 #define scm_is_number(x) (scm_number_p (x) == SCM_BOOL_T)
 inline int ly_scm2int (SCM x) { return scm_num2int (x, 0, "ly_scm2int"); }
 #define scm_to_int(x) (ly_scm2int (x))
+inline int ly_scm2unsigned (SCM x) { return scm_num2uint (x, 0, "ly_scm2unsigned"); }
+#define scm_to_unsigned(x) (ly_scm2unsigned (x))
 inline int ly_c_symbol_p (SCM x) { return SCM_SYMBOLP (x); }
 #define scm_is_symbol(x) ly_c_symbol_p (x)
 inline int ly_c_boolean_p (SCM x) { return SCM_BOOLP (x); }
-#define scm_is_bool(x) ly_c_boolean_p(x)
+#define scm_is_bool(x) ly_c_boolean_p (x)
 inline int ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); }
 #define scm_is_eq(x, y) (SCM_EQ_P ((x), (y)))
 
@@ -62,12 +67,17 @@ inline int ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); }
 #define scm_is_pair(x) (SCM_CONSP (x))
 
 #define scm_c_vector_length(x) SCM_VECTOR_LENGTH (x)
-#define scm_c_vector_ref(x, y) SCM_VECTOR_REF(x, y)
+#define scm_c_vector_ref(x, y) SCM_VECTOR_REF (x, y)
 
 inline double ly_scm2double (SCM x) { return scm_num2dbl (x, "ly_scm2double"); }
 #define scm_to_double(x) (ly_scm2double (x))
 #define scm_from_double(x) (scm_make_real (x))
 
-#endif /* SCM_MINOR_VERSION < 7 */
+#else /* !SCM_MINOR_VERSION < 7 */
+
+#define scm_to_unsigned(x) scm_to_uint32 (x)
+#define scm_from_unsigned(x) scm_from_unsigned_integer (x)
+
+#endif /* !SCM_MINOR_VERSION < 7 */
 
 #endif /* GUILE_COMPATIBILITY_HH */