From 963bc577644fcc8165504e000c29f54854947520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 23 Nov 2018 11:37:10 +0100 Subject: [PATCH] Use ISC_ATTR_ to define matching LIBRPZ __attributes__ --- lib/dns/include/dns/librpz.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h index dd1baca805..ef16f5e9d1 100644 --- a/lib/dns/include/dns/librpz.h +++ b/lib/dns/include/dns/librpz.h @@ -219,16 +219,10 @@ typedef struct { char c[120]; } librpz_emsg_t; +#define LIBRPZ_UNUSED ISC_ATTR_UNUSED +#define LIBRPZ_PF(f,l) ISC_ATTR_FORMAT_PRINTF(f, l) +#define LIBRPZ_NORET ISC_ATTR_NORETURN -#ifdef LIBRPZ_HAVE_ATTR -#define LIBRPZ_UNUSED __attribute__((unused)) -#define LIBRPZ_PF(f,l) __attribute__((format(printf,f,l))) -#define LIBRPZ_NORET __attribute__((__noreturn__)) -#else -#define LIBRPZ_UNUSED -#define LIBRPZ_PF(f,l) -#define LIBRPZ_NORET -#endif #ifdef HAVE_BUILTIN_EXPECT #define LIBRPZ_LIKELY(c) __builtin_expect(!!(c), 1)