diff options
| author | darrenr <darrenr@FreeBSD.org> | 2000-10-26 12:33:42 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2000-10-26 12:33:42 +0000 |
| commit | 1a1de29bc037bc05ce4aec3d225e476799ab5a27 (patch) | |
| tree | 50760b3edd676bcf8b9bc65cbfd7839eb1866c95 /sys/netinet/ip_raudio_pxy.c | |
| parent | a21e3405e2f118d575c74cf92c09a22eaee4c261 (diff) | |
| download | FreeBSD-src-1a1de29bc037bc05ce4aec3d225e476799ab5a27.zip FreeBSD-src-1a1de29bc037bc05ce4aec3d225e476799ab5a27.tar.gz | |
fix conflicts from rcsids
Diffstat (limited to 'sys/netinet/ip_raudio_pxy.c')
| -rw-r--r-- | sys/netinet/ip_raudio_pxy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet/ip_raudio_pxy.c b/sys/netinet/ip_raudio_pxy.c index fd62033..ee527a3 100644 --- a/sys/netinet/ip_raudio_pxy.c +++ b/sys/netinet/ip_raudio_pxy.c @@ -171,8 +171,8 @@ nat_t *nat; tcphdr_t *tcp, tcph, *tcp2 = &tcph; raudio_t *rap = aps->aps_data; struct in_addr swa, swb; - u_int a1, a2, a3, a4; int off, dlen, slen; + int a1, a2, a3, a4; u_short sp, dp; fr_info_t fi; tcp_seq seq; |
