--- gvpe/src/vpn_dns.C	2007/12/01 23:35:31	1.43
+++ gvpe/src/vpn_dns.C	2007/12/06 00:35:29	1.46
@@ -44,6 +44,7 @@
 
 #include <map>
 
+#include <cstdio> /* bug in libgmp: gmp.h relies on cstdio being included */
 #include <gmp.h>
 
 #include "netcompat.h"
@@ -561,7 +562,7 @@
   byte_stream rcvdq; int rcvseq; int repseq;
   byte_stream snddq; int sndseq;
 
-  void time_cb (ev::timer &w, int revents); ev::timer tw;
+  inline void time_cb (ev::timer &w, int revents); ev::timer tw;
   void receive_rep (dns_rcv *r);
 
   dns_connection (connection *c);
@@ -726,8 +727,9 @@
 : c (c)
 , rcvdq (MAX_BACKLOG * 2)
 , snddq (MAX_BACKLOG)
-, tw (this, &dns_connection::time_cb)
 {
+  tw.set<dns_connection, &dns_connection::time_cb> (this);
+
   vpn = c->vpn;
 
   established = false;