--- Coro/Event/Event.xs	2002/04/14 01:18:38	1.8
+++ Coro/Event/Event.xs	2003/03/22 18:50:32	1.9
@@ -11,7 +11,7 @@
   dSP;
 
   PUSHMARK(SP);
-  XPUSHs (sv_2mortal(newSVpv("only one coroutine can wait for an event",0)));
+  XPUSHs (sv_2mortal(newSVpv("only one coroutine can wait for an event at any given time",0)));
   PUTBACK;
   call_pv ("Carp::confess", G_VOID);
 }
@@ -19,6 +19,10 @@
 #include "EventAPI.h"
 #include "../Coro/CoroAPI.h"
 
+#ifndef PE_PERLCB
+# define PE_PERLCB 0x020 /* not public, but we need it :( */
+#endif
+
 #define CD_CORO	0
 #define CD_TYPE	1
 #define CD_OK	2
@@ -80,7 +84,7 @@
 
 BOOT:
 {
-        I_EVENT_API("Coro::Event");
+        I_EVENT_API ("Coro::Event");
 	I_CORO_API ("Coro::Event");
 
         /* create a fake idle handler (we only ever call now) */
@@ -98,26 +102,31 @@
         int	type
         CODE:
         pe_watcher *w = GEventAPI->sv_2watcher (self);
-        AV *priv = newAV ();
-        SV *rv = newRV_noinc ((SV *)priv);
 
-        av_extend (priv, CD_MAX);
-        av_store (priv, CD_CORO, &PL_sv_undef);
-        av_store (priv, CD_TYPE, newSViv (type));
-        av_store (priv, CD_OK  , &PL_sv_no);
-        av_store (priv, CD_PRIO, newSViv (0));
-        av_store (priv, CD_HITS, newSViv (0));
-        av_store (priv, CD_GOT , type ? newSViv (0) : &PL_sv_undef);
-        SvREADONLY_on (priv);
-
-        w->callback = coro_std_cb;
-        w->ext_data = priv;
-
-        hv_store ((HV *)SvRV (self),
-                  EV_CLASS, strlen (EV_CLASS),
-                  rv, 0);
+        if (WaFLAGS (w) & PE_PERLCB)
+          croak ("Coro::Event watchers must not have a perl callback (see Coro::Event), caught");
+        {
+          AV *priv = newAV ();
+          SV *rv = newRV_noinc ((SV *)priv);
+
+          av_extend (priv, CD_MAX);
+          av_store (priv, CD_CORO, &PL_sv_undef);
+          av_store (priv, CD_TYPE, newSViv (type));
+          av_store (priv, CD_OK  , &PL_sv_no);
+          av_store (priv, CD_PRIO, newSViv (0));
+          av_store (priv, CD_HITS, newSViv (0));
+          av_store (priv, CD_GOT , type ? newSViv (0) : &PL_sv_undef);
+          SvREADONLY_on (priv);
+
+          w->callback = coro_std_cb;
+          w->ext_data = priv;
+
+          hv_store ((HV *)SvRV (self),
+                    EV_CLASS, strlen (EV_CLASS),
+                    rv, 0);
 
-        GEventAPI->start (w, 0);
+          GEventAPI->start (w, 0);
+        }
 
 void
 _next(self)