--- deliantra/server/include/cfperl.h 2006/12/15 19:59:19 1.37 +++ deliantra/server/include/cfperl.h 2006/12/16 21:40:26 1.39 @@ -27,6 +27,10 @@ #undef ctime #undef strerror +// same here, massive symbol spamming +#undef do_open +#undef do_close + // perl bug #40256: perl does overwrite those with reentrant versions // but does not initialise their state structures. #undef random @@ -357,6 +361,19 @@ void cancel () { GEventAPI->cancel ((pe_watcher *)pe); } // private }; +struct iw : watcher, callback +{ + template + iw (O object, M method) + : callback (object, method) + { + alloc (); + } + +private: + void alloc (); +}; + struct iow : watcher, callback { template @@ -366,9 +383,9 @@ alloc (); } - iow &fd (int fd); + void fd (int fd); int poll (); - iow &poll (int events); + void poll (int events); private: void alloc ();