summaryrefslogtreecommitdiff
path: root/libguile/struct.c
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-07-23 15:43:02 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-07-23 15:43:02 +0000
commite11e83f3d99305ada6354cae7123fb8c0e998703 (patch)
tree23dccd2a0fd1741abb8561214acadc347036480b /libguile/struct.c
parent928e0f421070bb610f3375d5808a6378d5edfa1b (diff)
downloadguile-e11e83f3d99305ada6354cae7123fb8c0e998703.tar.gz
* deprecated.h, deprecated.c, numbers.h (SCM_INUMP, SCM_NINUMP,
SCM_INUM): Deprecated by reenaming them to SCM_I_INUMP, SCM_I_NINUMP and SCM_I_INUM, respectively and adding deprecated versions to deprecated.h and deprecated.c. Changed all uses to either use the SCM_I_ variants or scm_is_*, scm_to_*, or scm_from_*, as appropriate.
Diffstat (limited to 'libguile/struct.c')
-rw-r--r--libguile/struct.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libguile/struct.c b/libguile/struct.c
index 3cc390784..6535064fd 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -114,7 +114,7 @@ SCM_DEFINE (scm_make_struct_layout, "make-struct-layout", 1, 0, 0,
{
if (field_desc[x + 2] != '-')
SCM_MISC_ERROR ("missing dash field at position ~A",
- scm_list_1 (SCM_I_MAKINUM (x / 2)));
+ scm_list_1 (scm_from_int (x / 2)));
x += 2;
goto recheck_ref;
}
@@ -789,14 +789,14 @@ void
scm_init_struct ()
{
scm_struct_table
- = scm_permanent_object (scm_make_weak_key_hash_table (SCM_I_MAKINUM (31)));
+ = scm_permanent_object (scm_make_weak_key_hash_table (scm_from_int (31)));
required_vtable_fields = scm_makfrom0str ("prsrpw");
scm_permanent_object (required_vtable_fields);
- scm_c_define ("vtable-index-layout", SCM_I_MAKINUM (scm_vtable_index_layout));
- scm_c_define ("vtable-index-vtable", SCM_I_MAKINUM (scm_vtable_index_vtable));
+ scm_c_define ("vtable-index-layout", scm_from_int (scm_vtable_index_layout));
+ scm_c_define ("vtable-index-vtable", scm_from_int (scm_vtable_index_vtable));
scm_c_define ("vtable-index-printer",
- SCM_I_MAKINUM (scm_vtable_index_printer));
- scm_c_define ("vtable-offset-user", SCM_I_MAKINUM (scm_vtable_offset_user));
+ scm_from_int (scm_vtable_index_printer));
+ scm_c_define ("vtable-offset-user", scm_from_int (scm_vtable_offset_user));
#include "libguile/struct.x"
}