X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhelper%2Flog.h;h=f43e1e6cb0ba8c8bf3df1fc65c0a549b524a0d42;hb=113679ff59e20530c621051d0aceb1876a49c45d;hp=c3be0747ad6d44c723cb9ae6e1af457705f505a3;hpb=8b994145b849c40b0a195c3fb332b9770b2f9097;p=openocd

diff --git a/src/helper/log.h b/src/helper/log.h
index c3be0747..f43e1e6c 100644
--- 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);
@@ -64,6 +73,15 @@ extern void kept_alive(void);
 extern void alive_sleep(int ms);
 extern void busy_sleep(int ms);
 
+
+/* log entries can be paused and replayed roughly according to the try/catch/rethrow
+ * concepts in C++
+ */
+void log_try(void);
+void log_catch(void);
+void log_rethrow(void);
+
+
 typedef void (*log_callback_fn)(void *priv, const char *file, int line,
 		const char *function, const char *string);