From: Roy Marples <roy@marples.name>
Date: Fri, 23 Oct 2015 20:48:20 +0000 (+0000)
Subject: Remove _dead macro and swap printflike position.
X-Git-Tag: v6.9.4~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65e35a35cece06ecee5a405800455e331b4cda71;p=thirdparty%2Fdhcpcd.git

Remove _dead macro and swap printflike position.
---

diff --git a/common.h b/common.h
index 7cef0cf2..60603419 100644
--- a/common.h
+++ b/common.h
@@ -113,9 +113,6 @@
 #endif
 
 #if __GNUC__ > 2 || defined(__INTEL_COMPILER)
-# ifndef __dead
-#  define __dead __attribute__((__noreturn__))
-# endif
 # ifndef __packed
 #  define __packed   __attribute__((__packed__))
 # endif
@@ -126,9 +123,6 @@
 #  define __unused   __attribute__((__unused__))
 # endif
 #else
-# ifndef __dead
-#  define __dead
-# endif
 # ifndef __packed
 #  define __packed
 # endif
@@ -172,7 +166,7 @@ int get_monotonic(struct timespec *);
 #if USE_LOGFILE
 void logger_open(struct dhcpcd_ctx *);
 #define logger_mask(ctx, lvl) setlogmask((lvl))
-__printflike(3, 4) void logger(struct dhcpcd_ctx *, int, const char *, ...);
+void logger(struct dhcpcd_ctx *, int, const char *, ...) __printflike(3, 4);
 void logger_close(struct dhcpcd_ctx *);
 #else
 #define logger_open(ctx) openlog(PACKAGE, LOG_PERROR | LOG_PID, LOG_DAEMON)