From 24d61c1ea6524a1b7910f56be8efa8856dc8def0 Mon Sep 17 00:00:00 2001 From: darrenr Date: Sun, 13 Aug 2000 04:31:06 +0000 Subject: resolve conflicts --- sys/netinet/ip_ftp_pxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/netinet/ip_ftp_pxy.c') diff --git a/sys/netinet/ip_ftp_pxy.c b/sys/netinet/ip_ftp_pxy.c index 0eb54c0..ce06851 100644 --- a/sys/netinet/ip_ftp_pxy.c +++ b/sys/netinet/ip_ftp_pxy.c @@ -262,7 +262,7 @@ int dlen; ip->ip_len = slen; ip->ip_src = swip; } - return inc; + return APR_INC(inc); } @@ -702,7 +702,7 @@ int rv; t->ftps_seq = ntohl(tcp->th_ack); f->ftps_rptr = rptr; f->ftps_wptr = wptr; - return inc; + return APR_INC(inc); } -- cgit v1.1