--- gvpe/src/util.h	2007/11/10 05:14:22	1.20
+++ gvpe/src/util.h	2007/12/02 00:54:52	1.23
@@ -32,7 +32,7 @@
 #include "ev_cpp.h"
 #include "callback.h"
 
-typedef ev::ev_tstamp tstamp;
+typedef ev_tstamp tstamp;
 
 /*
  * check for an existing gvpe for this net, and write pid to pidfile
@@ -62,7 +62,8 @@
 
 #define mac2id(p) ((p)[0] & 0x01 ? 0 : ((p)[4] << 8) | (p)[5])
 
-struct sliding_window {
+struct sliding_window
+{
   u32 v[(WINDOWSIZE + 31) / 32];
   u32 seq;
 
@@ -111,7 +112,7 @@
     }
 };
 
-typedef callback0<const char *> run_script_cb;
+typedef callback<const char * ()> run_script_cb;
 
 // run a shell script (or actually an external program).
 bool run_script (const run_script_cb &cb, bool wait);