From 39f560f134ae8301202469be54cf4428e11ccbfd Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 10 Oct 2019 11:14:36 -0400 Subject: [PATCH] tests: rename PRINT_FORMAT to TAP_PRINTF_FORMAT Use a namespace, so we can define our own for the rest of babeltrace (will be called BT_PRINTF_FORMAT) without colliding. Change-Id: I03f5d4cf050f94de294bb179450876b300d53b91 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/2165 Reviewed-by: Francis Deslauriers --- tests/utils/tap/tap.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/utils/tap/tap.h b/tests/utils/tap/tap.h index 190c4a94..c653076d 100644 --- a/tests/utils/tap/tap.h +++ b/tests/utils/tap/tap.h @@ -75,26 +75,26 @@ #define skip_end() } while(0); #ifdef __MINGW_PRINTF_FORMAT -# define PRINT_FORMAT __MINGW_PRINTF_FORMAT +# define TAP_PRINTF_FORMAT __MINGW_PRINTF_FORMAT #else -# define PRINT_FORMAT printf +# define TAP_PRINTF_FORMAT printf #endif -__attribute__((format(PRINT_FORMAT, 5, 6))) +__attribute__((format(TAP_PRINTF_FORMAT, 5, 6))) unsigned int _gen_result(int, const char *, const char *, unsigned int, const char *, ...); int plan_no_plan(void); int plan_skip_all(const char *); int plan_tests(unsigned int); -__attribute__((format(PRINT_FORMAT, 1, 2))) +__attribute__((format(TAP_PRINTF_FORMAT, 1, 2))) unsigned int diag(const char *, ...); void diag_multiline(const char *); -__attribute__((format(PRINT_FORMAT, 2, 3))) +__attribute__((format(TAP_PRINTF_FORMAT, 2, 3))) int skip(unsigned int, const char *, ...); -__attribute__((format(PRINT_FORMAT, 1, 2))) +__attribute__((format(TAP_PRINTF_FORMAT, 1, 2))) void todo_start(const char *, ...); void todo_end(void); -- 2.34.1