--- plb-0.3/src/plb_session.c	2003-02-26 06:57:58.000000000 -0800
+++ plb-ignatz-0.3/src/plb_session.c	2008-02-15 04:38:51.000000000 -0800
@@ -31,19 +31,19 @@
     }
     if (EVENT_FD((&client->server_read_ev)) != -1) {
         event_del(&client->server_read_ev);
-        EVENT_FD((&client->server_read_ev)) = -1;
+        (&client->server_read_ev)->ev_fd = -1;
     }
     if (EVENT_FD((&client->server_write_ev)) != -1) {
         event_del(&client->server_write_ev);
-        EVENT_FD((&client->server_write_ev)) = -1;
+        (&client->server_write_ev)->ev_fd = -1;
     }
     if (EVENT_FD((&client->client_read_ev)) != -1) {
         event_del(&client->client_read_ev);
-        EVENT_FD((&client->client_read_ev)) = -1;
+        (&client->client_read_ev)->ev_fd = -1;
     }
     if (EVENT_FD((&client->client_write_ev)) != -1) {
         event_del(&client->client_write_ev);
-        EVENT_FD((&client->client_write_ev)) = -1;
+        (&client->client_write_ev)->ev_fd = -1;
     }
     if (client->server_fd != -1) {
         while (close(client->server_fd) != 0 && errno == EINTR);
@@ -137,10 +137,10 @@
     client->postbuf_written = (size_t) 0U;    
     client->replybuf_len = (size_t) 0U;
     client->replybuf_written = (size_t) 0U;    
-    EVENT_FD((&client->client_read_ev)) = -1;
-    EVENT_FD((&client->client_write_ev)) = -1;
-    EVENT_FD((&client->server_read_ev)) = -1;
-    EVENT_FD((&client->server_write_ev)) = -1;
+    (&client->client_read_ev)->ev_fd = -1;
+    (&client->client_write_ev)->ev_fd = -1;
+    (&client->server_read_ev)->ev_fd = -1;
+    (&client->server_write_ev)->ev_fd = -1;
     event_set(&client->client_read_ev, client_fd,
               EV_READ, client_read, &clients[client_fd]);
     event_add(&client->client_read_ev, &timeout_header_client_read);