diff options
| author | Darren Reed <darrenr@FreeBSD.org> | 2000-10-26 12:33:42 +0000 |
|---|---|---|
| committer | Darren Reed <darrenr@FreeBSD.org> | 2000-10-26 12:33:42 +0000 |
| commit | 60b88d968109bbc3610ea0ffe914f9f3ea6171c7 (patch) | |
| tree | 251c1cca4ffd3f158d51a4faa06d5244da446c75 /sys/netinet/ip_raudio_pxy.c | |
| parent | 5b4d40c6384d2cde3f0e0f4111f876b6347448cd (diff) | |
| download | src-60b88d968109bbc3610ea0ffe914f9f3ea6171c7.tar.gz src-60b88d968109bbc3610ea0ffe914f9f3ea6171c7.zip | |
fix conflicts from rcsids
Notes
Notes:
svn path=/head/; revision=67614
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 fd6203388816..ee527a345e9d 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; |