* 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.

1 files changed, 2 insertions, 2 deletions

diff --git a/libguile/error.c b/libguile/error.c
index 41588f7ce..849b0aaa6 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -240,7 +240,7 @@ scm_wrong_type_arg (const char *subr, int pos, SCM bad_value)
 	     (pos == 0) ? "Wrong type argument: ~S"
 	     : "Wrong type argument in position ~A: ~S",
 	     (pos == 0) ? scm_list_1 (bad_value)
-	     : scm_list_2 (SCM_I_MAKINUM (pos), bad_value),
+	     : scm_list_2 (scm_from_int (pos), bad_value),
 	     SCM_BOOL_F);
 }
 
@@ -257,7 +257,7 @@ scm_wrong_type_arg_msg (const char *subr, int pos, SCM bad_value, const char *sz
     scm_error (scm_arg_type_key,
                subr,
                "Wrong type argument in position ~A (expecting ~A): ~S",
-               scm_list_3 (SCM_I_MAKINUM (pos), msg, bad_value),
+               scm_list_3 (scm_from_int (pos), msg, bad_value),
                SCM_BOOL_F);
   }
 }