diff options
author | darrenr <darrenr@FreeBSD.org> | 2000-08-13 04:31:06 +0000 |
---|---|---|
committer | darrenr <darrenr@FreeBSD.org> | 2000-08-13 04:31:06 +0000 |
commit | 24d61c1ea6524a1b7910f56be8efa8856dc8def0 (patch) | |
tree | 93a3df605afd9999f0dbab48bc27492ac19c8a02 /sys/netinet/ip_ftp_pxy.c | |
parent | 8c08c8f2561bed1192e70cf4fc45e37370e1905a (diff) | |
download | FreeBSD-src-24d61c1ea6524a1b7910f56be8efa8856dc8def0.zip FreeBSD-src-24d61c1ea6524a1b7910f56be8efa8856dc8def0.tar.gz |
resolve conflicts
Diffstat (limited to 'sys/netinet/ip_ftp_pxy.c')
-rw-r--r-- | sys/netinet/ip_ftp_pxy.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |