--- gvpe/src/util.h	2003/04/02 03:06:22	1.5
+++ gvpe/src/util.h	2003/10/16 02:28:36	1.8
@@ -50,20 +50,9 @@
  */
 #define ABSOLUTE_PATH(c) ((c)[0] == '/')
 
-static inline void
-id2mac (unsigned int id, void *m)
-{
-  mac &p = *(mac *)m;
-
-  p[0] = 0xfe;
-  p[1] = 0xfd;
-  p[2] = 0x80;
-  p[3] = 0x00;
-  p[4] = id >> 8;
-  p[5] = id;
-}
+extern void id2mac (unsigned int id, void *m);
 
-#define mac2id(p) (p[0] & 0x01 ? 0 : (p[4] << 8) | p[5])
+#define mac2id(p) ((p)[0] & 0x01 ? 0 : ((p)[4] << 8) | (p)[5])
 
 struct sliding_window {
   u32 v[(WINDOWSIZE + 31) / 32];
@@ -115,10 +104,14 @@
     }
 };
 
-typedef callback<const char *, int> run_script_cb;
+typedef callback0<const char *> run_script_cb;
 
 // run a shell script (or actually an external program).
 void run_script (const run_script_cb &cb, bool wait);
 
+#if ENABLE_HTTP_PROXY
+u8 *base64_encode (const u8 *data, unsigned int len);
+#endif
+
 #endif