corrective fix for MinGW GNU C99 printf compliance

[openocd.git] / src / helper / log.h

diff --git a/src/helper/log.h b/src/helper/log.h
index 7fc5a886e84bc3d8ee5464ecc2cf6f64f44520dd..f43e1e6cb0ba8c8bf3df1fc65c0a549b524a0d42 100644 (file)
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -28,6 +28,15 @@
 
 #include "command.h"
 
+/* To achieve C99 printf compatibility in MinGW, gnu_printf should be
+ * used for __attribute__((format( ... ))), with GCC v4.4 or later
+ */
+#if (defined(IS_MINGW) && (((__GNUC__ << 16) + __GNUC_MINOR__) >= 0x00040004))
+#define PRINTF_ATTRIBUTE_FORMAT gnu_printf
+#else
+#define PRINTF_ATTRIBUTE_FORMAT printf
+#endif
+
 /* logging priorities
  * LOG_LVL_SILENT - turn off all output. In lieu of try + catch this can be used as a
  *                  feeble ersatz.
@@ -52,10 +61,10 @@ enum log_levels
 
 extern void log_printf(enum log_levels level, const char *file, int line,
        const char *function, const char *format, ...)
-__attribute__ ((format (printf, 5, 6)));
+__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6)));
 extern void log_printf_lf(enum log_levels level, const char *file, int line,
        const char *function, const char *format, ...)
-__attribute__ ((format (printf, 5, 6)));
+__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6)));
 extern int log_register_commands(struct command_context_s *cmd_ctx);
 extern int log_init(struct command_context_s *cmd_ctx);
 extern int set_log_output(struct command_context_s *cmd_ctx, FILE *output);