[uim-commit] r2659 - branches/r5rs/uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-12-20 01:00:13 -0800 (Tue, 20 Dec 2005)
New Revision: 2659

Modified:
   branches/r5rs/uim/uim-scm.c
Log:
* uim/uim-scm.c
  - (uim_scm_make_bool, uim_scm_make_int, uim_scm_make_ptr,
    uim_scm_make_func_ptr): Rewrite with new object creator macro


Modified: branches/r5rs/uim/uim-scm.c
===================================================================
--- branches/r5rs/uim/uim-scm.c	2005-12-19 19:09:41 UTC (rev 2658)
+++ branches/r5rs/uim/uim-scm.c	2005-12-20 09:00:13 UTC (rev 2659)
@@ -122,7 +122,7 @@
 uim_lisp
 uim_scm_make_bool(uim_bool val)
 {
-  return (val) ? uim_scm_t() : uim_scm_f();
+  return (uim_lisp)SCM_MAKE_BOOL(val);
 }
 
 int
@@ -166,7 +166,7 @@
 uim_lisp
 uim_scm_make_int(int integer)
 {
-  return (uim_lisp)scm_make_int(integer);
+  return (uim_lisp)SCM_MAKE_INT(integer);
 }
 
 char *
@@ -251,7 +251,7 @@
 uim_lisp
 uim_scm_make_ptr(void *ptr)
 {
-  return (uim_lisp)scm_make_cpointer(ptr);
+  return (uim_lisp)SCM_MAKE_C_POINTER(ptr);
 }
 
 uim_func_ptr
@@ -269,7 +269,7 @@
 uim_lisp
 uim_scm_make_func_ptr(uim_func_ptr func_ptr)
 {
-  return (uim_lisp)scm_make_cfunc_pointer((ScmCFunc)func_ptr);
+  return (uim_lisp)SCM_MAKE_C_FUNCPOINTER((ScmCFunc)func_ptr);
 }
 
 void