[uim-commit] r1516 - trunk/uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-09-18 06:11:03 -0700 (Sun, 18 Sep 2005)
New Revision: 1516

Modified:
   trunk/uim/siod.h
   trunk/uim/slib.c
   trunk/uim/uim-scm-gc.c
Log:
* This commit fixes broken codes of r1515

* uim/siod.h
  - (gc_protect): Define as alias of siod_gc_protect()
  - (siod_gc_protect): New prototype decl
  - (siod_gc_protect_stack, siod_gc_unprotect_stack): New prototype decl
* uim/slib.c
  - (gc_protect): Rename to siod_gc_protect()
  - (siod_gc_protect):
    * Renamed from gc_protect()
    * Export as global function
  - (siod_gc_protect_stack, siod_gc_unprotect_stack): Export as global
    function
* uim/uim-scm-gc.c
  - (uim_scm_gc_protect): Replace gc_protect() with siod_gc_protect()
  - (uim_scm_gc_protect_stack): Fix incorrect argument type of
    copy&pasted code


Modified: trunk/uim/siod.h
===================================================================
--- trunk/uim/siod.h	2005-09-18 11:52:12 UTC (rev 1515)
+++ trunk/uim/siod.h	2005-09-18 13:11:03 UTC (rev 1516)
@@ -215,4 +215,12 @@
 
 #define TKBUFFERN 5120
 
+#define gc_protect siod_gc_protect
+
+void siod_gc_protect (LISP * location);
+#if (NESTED_REPL_C_STRING)
+void siod_gc_protect_stack(LISP *stack_start);
+void siod_gc_unprotect_stack(LISP *stack_start);
+#endif
+
 #endif /* __SIOD_H__ */

Modified: trunk/uim/slib.c
===================================================================
--- trunk/uim/slib.c	2005-09-18 11:52:12 UTC (rev 1515)
+++ trunk/uim/slib.c	2005-09-18 13:11:03 UTC (rev 1516)
@@ -213,11 +213,7 @@
 static LISP equal (LISP, LISP);
 static void set_fatal_exit_hook (void (*fcn) (void));
 static LISP intern (LISP x);
-static void gc_protect (LISP * location);
-#if (NESTED_REPL_C_STRING)
-static void siod_gc_protect_stack(LISP *stack_start);
-static void siod_gc_unprotect_stack(LISP *stack_start);
-#else
+#if !(NESTED_REPL_C_STRING)
 static int siod_repl_c_string_entered (void);
 #endif
 static long repl_c_string (const char *, long want_init, long want_print);
@@ -1581,7 +1577,7 @@
 }
 
 #if (NESTED_REPL_C_STRING)
-static void
+void
 siod_gc_protect_stack(LISP *stack_start)
 {
   if (!stack_start_ptr) {
@@ -1590,7 +1586,7 @@
   }
 }
 
-static void
+void
 siod_gc_unprotect_stack(LISP *stack_start)
 {
   if (stack_start_ptr == stack_start)
@@ -2278,8 +2274,8 @@
   protected_registers = reg;
 }
 
-static void
-gc_protect (LISP * location)
+void
+siod_gc_protect (LISP * location)
 {
   gc_protect_n (location, 1);
 }

Modified: trunk/uim/uim-scm-gc.c
===================================================================
--- trunk/uim/uim-scm-gc.c	2005-09-18 11:52:12 UTC (rev 1515)
+++ trunk/uim/uim-scm-gc.c	2005-09-18 13:11:03 UTC (rev 1516)
@@ -39,11 +39,11 @@
 void
 uim_scm_gc_protect(uim_lisp *location)
 {
-  gc_protect((LISP *)location);
+  siod_gc_protect((LISP *)location);
 }
 
 uim_lisp *
-uim_scm_gc_protect_stack(uim_lisp *stack_start)
+uim_scm_gc_protect_stack(void)
 {
   LISP stack_start;