[src/trunk]: src/external/bsd/tmux/dist Fix merge error of diagnostic pragmas.

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f8923095d915
branches:  trunk
changeset: 342958:f8923095d915
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Jan 16 01:14:21 2016 +0000

description:
Fix merge error of diagnostic pragmas.

diffstat:

 external/bsd/tmux/dist/log.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r b2e58396626a -r f8923095d915 external/bsd/tmux/dist/log.c
--- a/external/bsd/tmux/dist/log.c      Sat Jan 16 01:05:40 2016 +0000
+++ b/external/bsd/tmux/dist/log.c      Sat Jan 16 01:14:21 2016 +0000
@@ -93,9 +93,6 @@
        free(out);
        free(fmt);
 }
-#if __GNUC_PREREQ__(4, 6) || defined(__clang__)
-#pragma GCC diagnostic push
-#endif
 
 /* Log a debug message. */
 void
@@ -108,6 +105,11 @@
        va_end(ap);
 }
 
+#if __GNUC_PREREQ__(4, 6) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
+
 /* Log a critical error with error string and die. */
 __dead void
 log_fatal(const char *msg, ...)
@@ -135,3 +137,7 @@
        log_vwrite(fmt, ap);
        exit(1);
 }
+
+#if __GNUC_PREREQ__(4, 6) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif