diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-08-20 15:53:03 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-09-21 10:29:39 +0200 |
| commit | 18fa92c2dcc6c52e0bf27d214d80f0c25a89b47d (patch) | |
| tree | a3020ac5b1f366f2f0920941b589808e435dbcee /freebsd/include | |
| parent | Update to FreeBSD head 2017-12-01 (diff) | |
| download | rtems-libbsd-18fa92c2dcc6c52e0bf27d214d80f0c25a89b47d.tar.bz2 | |
Update to FreeBSD head 2018-02-01
Git mirror commit d079ae0442af8fa3cfd6d7ede190d04e64a2c0d4.
Update #3472.
Diffstat (limited to 'freebsd/include')
| -rw-r--r-- | freebsd/include/arpa/nameser.h | 6 | ||||
| -rw-r--r-- | freebsd/include/err.h | 2 | ||||
| -rw-r--r-- | freebsd/include/ifaddrs.h | 4 | ||||
| -rw-r--r-- | freebsd/include/netdb.h | 2 | ||||
| -rw-r--r-- | freebsd/include/res_update.h | 4 | ||||
| -rw-r--r-- | freebsd/include/resolv.h | 2 |
6 files changed, 12 insertions, 8 deletions
diff --git a/freebsd/include/arpa/nameser.h b/freebsd/include/arpa/nameser.h index f0e3482a..5dcc4f3b 100644 --- a/freebsd/include/arpa/nameser.h +++ b/freebsd/include/arpa/nameser.h @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: (ISC AND BSD-3-Clause) + * * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 1996-2003 Internet Software Consortium. * @@ -16,8 +18,6 @@ */ /*- - * SPDX-License-Identifier: BSD-3-Clause - * * Copyright (c) 1983, 1989, 1993 * The Regents of the University of California. All rights reserved. * diff --git a/freebsd/include/err.h b/freebsd/include/err.h index 636185e2..beb536cf 100644 --- a/freebsd/include/err.h +++ b/freebsd/include/err.h @@ -60,7 +60,7 @@ void vwarn(const char *, __va_list) __printf0like(1, 0); void warnc(int, const char *, ...) __printf0like(2, 3); void vwarnc(int, const char *, __va_list) __printf0like(2, 0); void warnx(const char *, ...) __printflike(1, 2); -void vwarnx(const char *, __va_list) __printflike(1, 0); +void vwarnx(const char *, __va_list) __printf0like(1, 0); #ifndef __rtems__ void err_set_file(void *); void err_set_exit(void (* _Nullable)(int)); diff --git a/freebsd/include/ifaddrs.h b/freebsd/include/ifaddrs.h index e768d50c..5e195363 100644 --- a/freebsd/include/ifaddrs.h +++ b/freebsd/include/ifaddrs.h @@ -1,6 +1,8 @@ /* $FreeBSD$ */ -/* +/*- + * SPDX-License-Identifier: BSD-1-Clause + * * Copyright (c) 1995, 1999 * Berkeley Software Design, Inc. All rights reserved. * diff --git a/freebsd/include/netdb.h b/freebsd/include/netdb.h index f46f5a3c..a106338a 100644 --- a/freebsd/include/netdb.h +++ b/freebsd/include/netdb.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (BSD-3-Clause AND ISC) * * Copyright (c) 1980, 1983, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/include/res_update.h b/freebsd/include/res_update.h index 06f3b3a5..32d363ba 100644 --- a/freebsd/include/res_update.h +++ b/freebsd/include/res_update.h @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: ISC + * * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1999 by Internet Software Consortium, Inc. * diff --git a/freebsd/include/resolv.h b/freebsd/include/resolv.h index 1f4a9bc8..2226c481 100644 --- a/freebsd/include/resolv.h +++ b/freebsd/include/resolv.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause + * SPDX-License-Identifier: (ISC AND BSD-3-Clause) * * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 1995-2003 Internet Software Consortium. |