--- gvpe/src/util.h	2007/12/01 23:35:31	1.21
+++ gvpe/src/util.h	2007/12/04 14:55:59	1.24
@@ -24,6 +24,8 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
+#include <cstring>
+
 #include <openssl/rsa.h>
 
 #include "gettext.h"
@@ -62,7 +64,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 +114,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);