freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gcc 4.2 build.

Browse Source
This commit is contained in:
Xin LI
2007-07-03 09:14:19 +00:00
parent cccde43b42
commit e6df0ed507
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/plb/Makefile
View File

@@ -24,10 +24,6 @@ DOCS= AUTHORS CONTACT COPYING NEWS README THANKS TODO
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
BROKEN= Does not compile with GCC 4.2
.endif
post-extract:
@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/plb.sh.sample \
> ${WRKSRC}/plb.sh.sample

50
net/plb/files/patch-src__plb_session.c Normal file
View File

@@ -0,0 +1,50 @@
--- ./src/plb_session.c.orig 2003-02-26 22:57:58.000000000 +0800
+++ ./src/plb_session.c 2007-07-03 17:13:15.588392762 +0800
@@ -8,6 +8,8 @@
# include <dmalloc.h>
#endif
+#define EVENT_FD_(e) ((e)->ev_fd)
+
void client_disconnect(Client * const client)
{
current_nb_clients--;
@@ -31,19 +33,19 @@
}
if (EVENT_FD((&client->server_read_ev)) != -1) {
event_del(&client->server_read_ev);
- EVENT_FD((&client->server_read_ev)) = -1;
+ EVENT_FD_((&client->server_read_ev)) = -1;
}
if (EVENT_FD((&client->server_write_ev)) != -1) {
event_del(&client->server_write_ev);
- EVENT_FD((&client->server_write_ev)) = -1;
+ EVENT_FD_((&client->server_write_ev)) = -1;
}
if (EVENT_FD((&client->client_read_ev)) != -1) {
event_del(&client->client_read_ev);
- EVENT_FD((&client->client_read_ev)) = -1;
+ EVENT_FD_((&client->client_read_ev)) = -1;
}
if (EVENT_FD((&client->client_write_ev)) != -1) {
event_del(&client->client_write_ev);
- EVENT_FD((&client->client_write_ev)) = -1;
+ EVENT_FD_((&client->client_write_ev)) = -1;
}
if (client->server_fd != -1) {
while (close(client->server_fd) != 0 && errno == EINTR);
@@ -137,10 +139,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;
+ 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;
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);