Get rid of the last two warnings by turning them off around the problem

statements, if the compiler supports it.

2 files changed, 16 insertions, 2 deletions

diff --git a/log.c b/log.c
index ec54711a..d4808427 100644
--- a/log.c
+++ b/log.c
@@ -147,7 +147,7 @@ fatal(const char *msg, ...)
 	va_start(ap, msg);
 	if (asprintf(&fmt, "fatal: %s: %s", msg, strerror(errno)) == -1)
 		exit(1);
-	log_vwrite(fmt, ap);
+	no_format_nonliteral(log_vwrite(fmt, ap));
 	va_end(ap);
 	exit(1);
 }
@@ -162,7 +162,7 @@ fatalx(const char *msg, ...)
 	va_start(ap, msg);
 	if (asprintf(&fmt, "fatal: %s", msg) == -1)
 		exit(1);
-	log_vwrite(fmt, ap);
+	no_format_nonliteral(log_vwrite(fmt, ap));
 	va_end(ap);
 	exit(1);
 }
diff --git a/tmux.h b/tmux.h
index 7a77cdae..6c7cf046 100644
--- a/tmux.h
+++ b/tmux.h
@@ -93,6 +93,20 @@ struct winlink;
 #define DEFAULT_XPIXEL 16
 #define DEFAULT_YPIXEL 32
 
+/* Don't complain about format arguments. */
+#if __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#define no_format_nonliteral(x) do { \
+	_Pragma ("GCC diagnostic push") \
+	_Pragma ("GCC diagnostic ignored \"-Wformat-nonliteral\"") \
+	 x; \
+	_Pragma ("GCC diagnostic pop") \
+} while (0)
+#else
+#define no_format_nonliteral(x) do { \
+	 x; \
+} while (0)
+#endif
+
 /* Attribute to make GCC check printf-like arguments. */
 #define printflike(a, b) __attribute__ ((format (printf, a, b)))