--- deliantra/server/include/client.h	2007/11/08 19:43:24	1.69
+++ deliantra/server/include/client.h	2008/04/21 21:32:32	1.74
@@ -31,7 +31,7 @@
 #if HAVE_TCP_INFO
 # include <netinet/tcp.h>
 #else
-  struct tcpi_info {
+  struct tcp_info {
     // dummy
     char tcpi_state;
     char tcpi_ca_state;
@@ -146,11 +146,6 @@
   const packet_type *handler;
   char *data;
   int datalen;
-
-  ~command ()
-  {
-    sfree<char> (data, datalen + 1);
-  }
 };
 
 /* how many times we are allowed to give the wrong password before being kicked. */
@@ -263,7 +258,7 @@
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  iow socket_ev; void socket_cb (iow &w, int got);
+  iow socket_ev; void socket_cb (iow &w, int revents);
 
   std::deque< command, slice_allocator<command> > cmd_queue;