--- rxvt-unicode/src/rxvtdaemon.h	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/rxvtdaemon.h	2008/11/05 14:43:54	1.6
@@ -1,19 +1,19 @@
 #ifndef RXVT_DAEMON_H
 #define RXVT_DAEMON_H
 
-struct rxvt_connection {
-  int fd;
+#include "rxvtutil.h"
 
-  static const char *unix_sockname ();
+struct rxvt_connection
+{
+  int fd;
 
-  typedef char[4] token;
+  static char *unix_sockname ();
 
   void send (const char *data, int len);
   void send (const char *data);
   void send (int data);
 
-  bool recv (char *&data, int *len = 0);
-  bool recv (token &data);
+  bool recv (auto_str &data, int *len = 0);
   bool recv (int &data);
 };