Back out local NetBSD changes (removal of _U_ which expands to

attribute(unused)), to reduce diffs to upstream.
While that is ugly, we have the _U_ left in at other places.
This commit is contained in:
drochner 2007-07-28 16:02:17 +00:00
parent 68aa07a617
commit 427fb19923
2 changed files with 6 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.5 2007/07/24 11:53:40 drochner Exp $ */
/* $NetBSD: machdep.c,v 1.6 2007/07/28 16:02:17 drochner Exp $ */
/*
* Copyright (c) 1996, 1997
@ -27,7 +27,7 @@
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/machdep.c,v 1.13 2003/12/15 03:53:21 guy Exp (LBL)";
#else
__RCSID("$NetBSD: machdep.c,v 1.5 2007/07/24 11:53:40 drochner Exp $");
__RCSID("$NetBSD: machdep.c,v 1.6 2007/07/28 16:02:17 drochner Exp $");
#endif
#endif
@ -60,7 +60,7 @@ int snprintf(char *, size_t, const char *, ...)
#include "machdep.h"
int
abort_on_misalignment(char *ebuf, size_t ebufsiz)
abort_on_misalignment(char *ebuf _U_, size_t ebufsiz _U_)
{
#ifdef __osf__
static int buf[2] = { SSIN_UACPROC, UAC_SIGBUS };

View File

@ -1,4 +1,4 @@
/* $NetBSD: print-ipcomp.c,v 1.4 2007/07/24 11:53:44 drochner Exp $ */
/* $NetBSD: print-ipcomp.c,v 1.5 2007/07/28 16:02:18 drochner Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994
@ -27,7 +27,7 @@
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.20 2003/11/19 00:36:08 guy Exp";
#else
__RCSID("$NetBSD: print-ipcomp.c,v 1.4 2007/07/24 11:53:44 drochner Exp $");
__RCSID("$NetBSD: print-ipcomp.c,v 1.5 2007/07/28 16:02:18 drochner Exp $");
#endif
#endif
@ -55,7 +55,7 @@ struct ipcomp {
#include "extract.h"
int
ipcomp_print(register const u_char *bp, int *nhdr)
ipcomp_print(register const u_char *bp, int *nhdr _U_)
{
register const struct ipcomp *ipcomp;
register const u_char *ep;