Revision: 6851
Author: ek.kato
Date: Mon Dec 27 21:39:29 2010
Log: * Merge r6832 from trunk.
http://code.google.com/p/uim/source/detail?r=6851
Modified:
/branches/1.6
/branches/1.6/uim/uim-scm-sigscheme.c
=======================================
--- /branches/1.6/uim/uim-scm-sigscheme.c Wed Jul 28 00:01:13 2010
+++ /branches/1.6/uim/uim-scm-sigscheme.c Mon Dec 27 21:39:29 2010
@@ -87,7 +87,7 @@
static void *uim_scm_c_int_internal(void *uim_lisp_integer);
static void *uim_scm_make_int_internal(void *integer);
static void *uim_scm_c_char_internal(void *uim_lisp_ch);
-static void *uim_scm_make_char_internal(void *ch);
+static void *uim_scm_make_char_internal(intptr_t ch);
static const char *uim_scm_refer_c_str_internal(void *uim_lisp_str);
static void *uim_scm_make_str_internal(const char *str);
static void *uim_scm_make_str_directly_internal(char *str);
@@ -259,12 +259,11 @@
{
assert(uim_scm_gc_any_contextp());
- return
(uim_lisp)uim_scm_call_with_gc_ready_stack(uim_scm_make_char_internal,
- (void *)(intptr_t)ch);
+ return
(uim_lisp)uim_scm_call_with_gc_ready_stack((uim_gc_gate_func_ptr)uim_scm_make_char_internal,
(void *)(intptr_t)ch);
}
static void *
-uim_scm_make_char_internal(void *ch)
+uim_scm_make_char_internal(intptr_t ch)
{
return (void *)SCM_MAKE_CHAR((scm_ichar_t)ch);
}