[uim-commit] r1539 - trunk/uim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-09-23 00:16:07 -0700 (Fri, 23 Sep 2005)
New Revision: 1539

Modified:
   trunk/uim/plugin.c
   trunk/uim/slib.c
Log:
* uim/slib.c : Fix initialization of obj.dbg_info with
  -DDEBUG_SCM.
* uim/plugin.c : Use -DDEBUG not -DDEBUG_SCM for debugging plugin.


Modified: trunk/uim/plugin.c
===================================================================
--- trunk/uim/plugin.c	2005-09-22 12:19:09 UTC (rev 1538)
+++ trunk/uim/plugin.c	2005-09-23 07:16:07 UTC (rev 1539)
@@ -60,9 +60,9 @@
 #define PLUGIN_PREFIX "libuim-"
 #define PLUGIN_SUFFIX ".so"
 
-#ifdef DEBUG_SCM
-static int debug_scm = DEBUG_SCM;
-#define DPRINTFN(n,x)  if (debug_scm>(n)) fprintf x;
+#ifdef DEBUG
+static int debug_plugin = DEBUG;
+#define DPRINTFN(n,x)  if (debug_plugin>(n)) fprintf x;
 #else
 #define DPRINTFN(n,x)
 #endif

Modified: trunk/uim/slib.c
===================================================================
--- trunk/uim/slib.c	2005-09-22 12:19:09 UTC (rev 1538)
+++ trunk/uim/slib.c	2005-09-23 07:16:07 UTC (rev 1539)
@@ -255,7 +255,7 @@
 #define STACK_CHECK(_ptr) \
   if (((char *) (_ptr)) < stack_limit_ptr) err_stack((char *) _ptr);
 
-#define NEWCELL(_into, _type)         \
+#define _NEWCELL(_into, _type)         \
 {  if NULLP(freelist)                 \
       gc_for_newcell();               \
     _into = freelist;                 \
@@ -267,8 +267,12 @@
 #if ! DEBUG_SCM
 #define dbg_readini(f)
 #define dbg_readend()
-#define dbg_readabrt()
 #define dbg_register_closure(x)
+#define NEWCELL(_into, _type)	_NEWCELL (_into, _type)
+#else
+#define NEWCELL(_into, _type)		\
+{  _NEWCELL (_into, _type);		\
+   (*_into).dbg_info = car (dbg_pos);}
 #endif /* DEBUG_SCM */
 
 /* exported global symbol */