*** empty log message ***

diff --git a/src/iom_perl.h b/src/iom_perl.h
index 1b07a70..fffe96b 100644 (file)
--- a/src/iom_perl.h
+++ b/src/iom_perl.h
@@ -52,7 +52,7 @@ perl_watcher::invoke (const char *type, SV *self, int arg)
   LEAVE;
 
   if (SvTRUE (ERRSV))
-    rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
+    IOM_WARN ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
 }
 
 #define newSVtimer(timer) new_ref ((timer)->self, IOM_CLASS "::timer")

diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
index 4e8b1ff..cf965c0 100644 (file)
--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -304,6 +304,7 @@ void overlay::set (int x, int y, SV *text, SV *rend)
 /////////////////////////////////////////////////////////////////////////////
 
 #define IOM_CLASS "urxvt"
+#define IOM_WARN rxvt_warn
 #include <iom_perl.h>
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/src/typemap b/src/typemap
index ddb0b98..3b2a217 100644 (file)
--- a/src/typemap
+++ b/src/typemap
@@ -1,36 +1,22 @@
-perl_watcher *         T_IOM_WATCHER
-timer *                        T_IOM_TIMER
-iow *                  T_IOM_IOW
-pw *                   T_IOM_PW
-iw *                   T_IOM_IW
+rxvt_term *            T_TERM
 
-IOM_CHAINED            T_IOM_CHAINED
+overlay *              T_OVERLAY
+
+Time                   T_UV
+Atom                   T_UV
+Window                 T_UV
 
 
 INPUT
 
-T_IOM_WATCHER
-       $var = SvWATCHER ($arg);
-T_IOM_TIMER
-       $var = SvTIMER ($arg);
-T_IOM_IOW
-       $var = SvIOW ($arg);
-T_IOM_PW
-       $var = SvPW ($arg);
-T_IOM_IW
-       $var = SvIW ($arg);
+T_TERM
+       $var = SvTERM ($arg);
+T_OVERLAY
+       $var = SvOVERLAY ($arg);
 
 
 OUTPUT
 
-T_IOM_TIMER
-       $arg = newSVtimer ($var);
-T_IOM_IOW
-       $arg = newSViow ($var);
-T_IOM_PW
-       $arg = newSVpw ($var);
-T_IOM_IW
-       $arg = newSViw ($var);
-T_IOM_CHAINED
-       $arg = newSVsv (ST(0));
+T_TERM
+       $arg = newSVterm ($var);
 

diff --git a/src/typemap.iom b/src/typemap.iom
index 3b2a217..ddb0b98 100644 (file)
--- a/src/typemap.iom
+++ b/src/typemap.iom
@@ -1,22 +1,36 @@
-rxvt_term *            T_TERM
+perl_watcher *         T_IOM_WATCHER
+timer *                        T_IOM_TIMER
+iow *                  T_IOM_IOW
+pw *                   T_IOM_PW
+iw *                   T_IOM_IW
 
-overlay *              T_OVERLAY
-
-Time                   T_UV
-Atom                   T_UV
-Window                 T_UV
+IOM_CHAINED            T_IOM_CHAINED
 
 
 INPUT
 
-T_TERM
-       $var = SvTERM ($arg);
-T_OVERLAY
-       $var = SvOVERLAY ($arg);
+T_IOM_WATCHER
+       $var = SvWATCHER ($arg);
+T_IOM_TIMER
+       $var = SvTIMER ($arg);
+T_IOM_IOW
+       $var = SvIOW ($arg);
+T_IOM_PW
+       $var = SvPW ($arg);
+T_IOM_IW
+       $var = SvIW ($arg);
 
 
 OUTPUT
 
-T_TERM
-       $arg = newSVterm ($var);
+T_IOM_TIMER
+       $arg = newSVtimer ($var);
+T_IOM_IOW
+       $arg = newSViow ($var);
+T_IOM_PW
+       $arg = newSVpw ($var);
+T_IOM_IW
+       $arg = newSViw ($var);
+T_IOM_CHAINED
+       $arg = newSVsv (ST(0));