diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
| commit | c1ad1296ec82096c8c861fcc68d08493af59a029 (patch) | |
| tree | 71f0f8d5860cc5ba4d96abee0d8048a044b51cd3 /contrib/tcpdump/parsenfsfh.c | |
| parent | 3d1038b8ce710e81c5ab991a014653e333d19837 (diff) | |
| download | src-c1ad1296ec82096c8c861fcc68d08493af59a029.tar.gz src-c1ad1296ec82096c8c861fcc68d08493af59a029.zip | |
resolve merge conflicts and update for proper build; including:
o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h
Reviewed by: bms
Notes
Notes:
svn path=/head/; revision=146778
Diffstat (limited to 'contrib/tcpdump/parsenfsfh.c')
| -rw-r--r-- | contrib/tcpdump/parsenfsfh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tcpdump/parsenfsfh.c b/contrib/tcpdump/parsenfsfh.c index c81803251cca..2e3da026b8f8 100644 --- a/contrib/tcpdump/parsenfsfh.c +++ b/contrib/tcpdump/parsenfsfh.c @@ -44,7 +44,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.25.2.2 2003/11/16 08:51:07 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.28 2004/03/25 03:30:55 mcr Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -113,7 +113,7 @@ static int is_UCX(const unsigned char *); void Parse_fh(fh, len, fsidp, inop, osnamep, fsnamep, ourself) register const unsigned char *fh; -int len; +int len _U_; my_fsid *fsidp; ino_t *inop; const char **osnamep; /* if non-NULL, return OS name here */ |