--- deliantra/server/socket/lowlevel.C	2007/11/08 19:43:30	1.62
+++ deliantra/server/socket/lowlevel.C	2007/11/14 08:09:46	1.63
@@ -64,7 +64,7 @@
         return;
     }
 
-  if (socket_ev.poll () & PE_W)
+  if (socket_ev.poll () & EV_WRITE)
     return;
 
   last_send = NOW;
@@ -101,7 +101,7 @@
       else if (errno == EAGAIN)
         {
           // delay till ready
-          socket_ev.poll (socket_ev.poll () | PE_W);
+          socket_ev.poll (socket_ev.poll () | EV_WRITE);
           socket_ev.start ();
           return;
         }
@@ -113,7 +113,7 @@
         }
     }
 
-  socket_ev.poll (socket_ev.poll () & ~PE_W);
+  socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
 }
 
 /******************************************************************************
@@ -295,14 +295,14 @@
   skip_packet (pkt_len);
 
   // input buffer has space again
-  socket_ev.poll (socket_ev.poll () | PE_R);
+  socket_ev.poll (socket_ev.poll () | EV_READ);
 
   return true;
 }
 
 // callback called when socket is either readable or writable
 void
-client::socket_cb (iow &w, int got)
+client::socket_cb (iow &w, int revents)
 {
   //TODO remove when we have better socket cleanup logic
   if (destroyed ())
@@ -311,15 +311,15 @@
       return;
     }
 
-  if (got & PE_W)
+  if (revents & EV_WRITE)
     {
       write_outputbuffer ();
 
       if (!outputbuffer.len)
-        socket_ev.poll (socket_ev.poll () & ~PE_W);
+        socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
     }
 
-  if (got & PE_R)
+  if (revents & EV_READ)
     {
       //TODO: rate-limit tcp connection in better ways, important
 
@@ -328,7 +328,7 @@
       if (!amount)
         {
           // input buffer full
-          socket_ev.poll (socket_ev.poll () & ~PE_R);
+          socket_ev.poll (socket_ev.poll () & ~EV_READ);
           return;
         }