94df3e688c
+ add support for gcc4
76 lines
2.4 KiB
Text
76 lines
2.4 KiB
Text
$NetBSD: patch-ar,v 1.1 2006/10/21 11:53:13 agc Exp $
|
|
|
|
--- ./sfsmisc/rex.C.orig 2002-11-28 16:21:03.000000000 +0000
|
|
+++ ./sfsmisc/rex.C
|
|
@@ -91,7 +91,7 @@ unixfd::newfd (svccb *sbp)
|
|
{
|
|
assert (paios_out);
|
|
|
|
- rexcb_newfd_arg *argp = sbp->template getarg<rexcb_newfd_arg> ();
|
|
+ rexcb_newfd_arg *argp = sbp->getarg<rexcb_newfd_arg> ();
|
|
|
|
int s[2];
|
|
|
|
@@ -115,7 +115,7 @@ unixfd::data (svccb *sbp)
|
|
{
|
|
assert (paios_out);
|
|
|
|
- rex_payload *argp = sbp->template getarg<rex_payload> ();
|
|
+ rex_payload *argp = sbp->getarg<rex_payload> ();
|
|
|
|
if (argp->data.size () > 0) {
|
|
if (weof) {
|
|
@@ -133,7 +133,7 @@ unixfd::data (svccb *sbp)
|
|
|
|
//we don't shutdown immediately to give data a chance to
|
|
//asynchronously flush
|
|
- paios_out->setwcb (wrap (this, &unixfd::update_connstate, SHUT_WR));
|
|
+ paios_out->setwcb (wrap (this, &unixfd::update_connstate, (int)SHUT_WR));
|
|
}
|
|
}
|
|
|
|
@@ -227,7 +227,7 @@ void
|
|
rexchannel::data(svccb *sbp)
|
|
{
|
|
assert (sbp->prog () == REXCB_PROG && sbp->proc () == REXCB_DATA);
|
|
- rex_payload *dp = sbp->template getarg<rex_payload> ();
|
|
+ rex_payload *dp = sbp->getarg<rex_payload> ();
|
|
assert (dp->channel == channo);
|
|
if (dp->fd < 0 ||
|
|
implicit_cast<size_t> (dp->fd) >= vfds.size () ||
|
|
@@ -245,7 +245,7 @@ void
|
|
rexchannel::newfd (svccb *sbp)
|
|
{
|
|
assert (sbp->prog () == REXCB_PROG && sbp->proc () == REXCB_NEWFD);
|
|
- rexcb_newfd_arg *arg = sbp->template getarg<rexcb_newfd_arg> ();
|
|
+ rexcb_newfd_arg *arg = sbp->getarg<rexcb_newfd_arg> ();
|
|
|
|
int fd = arg->fd;
|
|
|
|
@@ -308,7 +308,7 @@ rexsession::rexcb_dispatch (svccb *sbp)
|
|
|
|
case REXCB_EXIT:
|
|
{
|
|
- rex_int_arg *argp = sbp->template getarg<rex_int_arg> ();
|
|
+ rex_int_arg *argp = sbp->getarg<rex_int_arg> ();
|
|
rexchannel *chan = channels[argp->channel];
|
|
|
|
if (chan) {
|
|
@@ -326,7 +326,7 @@ rexsession::rexcb_dispatch (svccb *sbp)
|
|
|
|
case REXCB_DATA:
|
|
{
|
|
- rex_payload *argp = sbp->template getarg<rex_payload> ();
|
|
+ rex_payload *argp = sbp->getarg<rex_payload> ();
|
|
rexchannel *chan = channels[argp->channel];
|
|
|
|
if (chan)
|
|
@@ -338,7 +338,7 @@ rexsession::rexcb_dispatch (svccb *sbp)
|
|
|
|
case REXCB_NEWFD:
|
|
{
|
|
- rex_int_arg *argp = sbp->template getarg<rex_int_arg> ();
|
|
+ rex_int_arg *argp = sbp->getarg<rex_int_arg> ();
|
|
rexchannel *chan = channels[argp->channel];
|
|
if (chan)
|
|
chan->newfd (sbp);
|