[uim-commit] r1408 - in branches/r5rs: sigscheme uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-09-04 09:53:27 -0700 (Sun, 04 Sep 2005)
New Revision: 1408

Modified:
   branches/r5rs/sigscheme/datas.c
   branches/r5rs/sigscheme/sigscheme.h
   branches/r5rs/sigscheme/sigschemetype.h
   branches/r5rs/uim/uim-scm.c
Log:
* sigscheme/sigscheme.h
 - (C_FUNC): Rename to ScmCFunc since:
   * the naming convention looks like a macro
   * it does not have a SCM prefix
 - (ScmCFunc): Renamed from C_FUNC
 - (Scm_NewCFuncPointer, Scm_GetCFuncPointer): Follow the renaming
* sigscheme/sigschemetype.h
  - (struct ScmObjInternal_): Follow the renaming
* sigscheme/datas.c
  - (Scm_NewCPointer, Scm_GetCFuncPointer): Ditto
* uim/uim-scm.c
  - (uim_scm_c_func_ptr): Ditto


Modified: branches/r5rs/sigscheme/datas.c
===================================================================
--- branches/r5rs/sigscheme/datas.c	2005-09-04 07:46:01 UTC (rev 1407)
+++ branches/r5rs/sigscheme/datas.c	2005-09-04 16:53:27 UTC (rev 1408)
@@ -785,7 +785,7 @@
     return obj;
 }
 
-ScmObj Scm_NewCFuncPointer(C_FUNC func)
+ScmObj Scm_NewCFuncPointer(ScmCFunc func)
 {
     ScmObj obj = SCM_NULL;
     SCM_NEW_OBJ_INTERNAL(obj);
@@ -888,7 +888,7 @@
 }
 
 #if SCM_USE_NONSTD_FEATURES
-void* Scm_GetCPointer(ScmObj c_ptr)
+void *Scm_GetCPointer(ScmObj c_ptr)
 {
     if (!C_POINTERP(c_ptr))
         SigScm_ErrorObj("Scm_GetCPointer : c_ptr required but got ", c_ptr);
@@ -896,7 +896,7 @@
     return SCM_C_POINTER_VALUE(c_ptr);
 }
 
-C_FUNC Scm_GetCFuncPointer(ScmObj c_funcptr)
+ScmCFunc Scm_GetCFuncPointer(ScmObj c_funcptr)
 {
     if (!C_FUNCPOINTERP(c_funcptr))
         SigScm_ErrorObj("Scm_GetCFuncPointer : c_funcptr required but got ", c_funcptr);

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-09-04 07:46:01 UTC (rev 1407)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-09-04 16:53:27 UTC (rev 1408)
@@ -53,7 +53,7 @@
 /*=======================================
    Struct Declarations
 =======================================*/
-typedef void (*C_FUNC) (void);
+typedef void (*ScmCFunc) (void);
 
 /* type declaration */
 #include "sigschemetype.h"
@@ -123,14 +123,14 @@
 ScmObj Scm_NewValuePacket(ScmObj values);
 #if SCM_USE_NONSTD_FEATURES
 ScmObj Scm_NewCPointer(void *data);
-ScmObj Scm_NewCFuncPointer(C_FUNC func);
+ScmObj Scm_NewCFuncPointer(ScmCFunc func);
 #endif
 ScmObj Scm_Intern(const char *name);
 int    Scm_GetInt(ScmObj num);
 char*  Scm_GetString(ScmObj str);
 #if SCM_USE_NONSTD_FEATURES
 void*  Scm_GetCPointer(ScmObj c_ptr);
-C_FUNC Scm_GetCFuncPointer(ScmObj c_funcptr);
+ScmCFunc Scm_GetCFuncPointer(ScmObj c_funcptr);
 #endif
 ScmObj Scm_eval_c_string(const char *exp);
 #if SCM_COMPAT_SIOD

Modified: branches/r5rs/sigscheme/sigschemetype.h
===================================================================
--- branches/r5rs/sigscheme/sigschemetype.h	2005-09-04 07:46:01 UTC (rev 1407)
+++ branches/r5rs/sigscheme/sigschemetype.h	2005-09-04 16:53:27 UTC (rev 1408)
@@ -271,7 +271,7 @@
         } c_pointer;
 
         struct ScmCFuncPointer {
-            C_FUNC func;            
+            ScmCFunc func;            
         } c_func_pointer;
     } obj;
 };

Modified: branches/r5rs/uim/uim-scm.c
===================================================================
--- branches/r5rs/uim/uim-scm.c	2005-09-04 07:46:01 UTC (rev 1407)
+++ branches/r5rs/uim/uim-scm.c	2005-09-04 16:53:27 UTC (rev 1408)
@@ -164,7 +164,7 @@
 uim_lisp
 uim_scm_make_func_ptr(uim_func_ptr func_ptr)
 {
-  return (uim_lisp)Scm_NewCFuncPointer((C_FUNC)func_ptr);
+  return (uim_lisp)Scm_NewCFuncPointer((ScmCFunc)func_ptr);
 }
 
 void