From de8a76da2f374792594ce03a203b3f30e4889f6f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 4 Apr 2017 09:36:57 +0200 Subject: Update to FreeBSD head 2017-04-04 Git mirror commit 642b174daddbd0efd9bb5f242c43f4ab4db6869f. --- freebsd/include/arpa/nameser_compat.h | 1 + freebsd/include/err.h | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'freebsd/include') diff --git a/freebsd/include/arpa/nameser_compat.h b/freebsd/include/arpa/nameser_compat.h index edd7872f..e7b58056 100644 --- a/freebsd/include/arpa/nameser_compat.h +++ b/freebsd/include/arpa/nameser_compat.h @@ -179,6 +179,7 @@ typedef struct { #define T_ATMA ns_t_atma #define T_NAPTR ns_t_naptr #define T_A6 ns_t_a6 +#define T_DNAME ns_t_dname #define T_OPT ns_t_opt #define T_TSIG ns_t_tsig #define T_IXFR ns_t_ixfr diff --git a/freebsd/include/err.h b/freebsd/include/err.h index f47b0038..f81742ff 100644 --- a/freebsd/include/err.h +++ b/freebsd/include/err.h @@ -43,6 +43,8 @@ #include #include +__NULLABILITY_PRAGMA_PUSH + __BEGIN_DECLS void err(int, const char *, ...) __dead2 __printf0like(2, 3); void verr(int, const char *, __va_list) __dead2 __printf0like(2, 0); @@ -59,8 +61,9 @@ void warnx(const char *, ...) __printflike(1, 2); void vwarnx(const char *, __va_list) __printflike(1, 0); #ifndef __rtems__ void err_set_file(void *); -void err_set_exit(void (*)(int)); +void err_set_exit(void (* _Nullable)(int)); #endif /* __rtems__ */ __END_DECLS +__NULLABILITY_PRAGMA_POP #endif /* !_ERR_H_ */ -- cgit v1.2.3