summaryrefslogtreecommitdiff
path: root/libguile/options.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/options.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/options.c')
-rw-r--r--libguile/options.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/libguile/options.c b/libguile/options.c
index 9262d34fa..41cadc7b5 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -92,9 +92,8 @@ SCM_SYMBOL (scm_no_sym, "no");
static SCM protected_objects = SCM_EOL;
-
-/* Return a list of the current option setting. The format of an option
- * setting is described in the above documentation. */
+/* Return a list of the current option setting. The format of an
+ * option setting is described in the above documentation. */
static SCM
get_option_setting (const scm_t_option options[], unsigned int n)
{
@@ -109,7 +108,7 @@ get_option_setting (const scm_t_option options[], unsigned int n)
ls = scm_cons (SCM_PACK (options[i].name), ls);
break;
case SCM_OPTION_INTEGER:
- ls = scm_cons (SCM_I_MAKINUM (options[i].val), ls);
+ ls = scm_cons (scm_from_unsigned_integer (options[i].val), ls);
ls = scm_cons (SCM_PACK (options[i].name), ls);
break;
case SCM_OPTION_SCM:
@@ -138,7 +137,7 @@ get_documented_option_setting (const scm_t_option options[], unsigned int n)
ls = scm_cons (options[i].val ? scm_yes_sym : scm_no_sym, ls);
break;
case SCM_OPTION_INTEGER:
- ls = scm_cons (SCM_I_MAKINUM (options[i].val), ls);
+ ls = scm_cons (scm_from_unsigned_integer (options[i].val), ls);
break;
case SCM_OPTION_SCM:
ls = scm_cons (SCM_PACK (options[i].val), ls);
@@ -189,8 +188,7 @@ change_option_setting (SCM args, scm_t_option options[], unsigned int n, const c
case SCM_OPTION_INTEGER:
args = SCM_CDR (args);
SCM_ASSERT (SCM_CONSP (args), args, SCM_ARG1, s);
- SCM_ASSERT (SCM_INUMP (SCM_CAR (args)), args, SCM_ARG1, s);
- flags[i] = SCM_INUM (SCM_CAR (args));
+ flags[i] = scm_to_size_t (SCM_CAR (args));
break;
case SCM_OPTION_SCM:
args = SCM_CDR (args);