Module Name: src
Committed By: joerg
Date: Sat Jan 16 01:14:21 UTC 2016
Modified Files:
src/external/bsd/tmux/dist: log.c
Log Message:
Fix merge error of diagnostic pragmas.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/tmux/dist/log.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/dist/log.c
diff -u src/external/bsd/tmux/dist/log.c:1.9 src/external/bsd/tmux/dist/log.c:1.10
--- src/external/bsd/tmux/dist/log.c:1.9 Sun Jan 10 19:02:13 2016
+++ src/external/bsd/tmux/dist/log.c Sat Jan 16 01:14:21 2016
@@ -93,9 +93,6 @@ log_vwrite(const char *msg, va_list ap)
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 @@ log_debug(const char *msg, ...)
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_fatalx(const char *msg, ...)
log_vwrite(fmt, ap);
exit(1);
}
+
+#if __GNUC_PREREQ__(4, 6) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
