diff options
| -rw-r--r-- | example/calculator_test.c | 4 | ||||
| -rw-r--r-- | include/cmocka.h | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/example/calculator_test.c b/example/calculator_test.c index 60a7eb6..836e726 100644 --- a/example/calculator_test.c +++ b/example/calculator_test.c @@ -54,8 +54,8 @@ extern int perform_operation( int ** const intermediate_values, int * const error_occurred); extern int example_main(int argc, char *argv[]); -int example_test_fprintf(FILE* const file, const char *format, ...) PRINTF_ATTRIBUTE(2, 3); -int example_test_printf(const char *format, ...) PRINTF_ATTRIBUTE(1, 2); +int example_test_fprintf(FILE* const file, const char *format, ...) CMOCKA_PRINTF_ATTRIBUTE(2, 3); +int example_test_printf(const char *format, ...) CMOCKA_PRINTF_ATTRIBUTE(1, 2); static char temporary_buffer[256]; diff --git a/include/cmocka.h b/include/cmocka.h index 0047df9..4d0ecf9 100644 --- a/include/cmocka.h +++ b/include/cmocka.h @@ -47,9 +47,10 @@ int __stdcall IsDebuggerPresent(); /* GCC have printf type attribute check. */ #ifdef __GNUC__ -#define PRINTF_ATTRIBUTE(a,b) __attribute__ ((__format__ (__printf__, a, b))) +#define CMOCKA_PRINTF_ATTRIBUTE(a,b) \ + __attribute__ ((__format__ (__printf__, a, b))) #else -#define PRINTF_ATTRIBUTE(a,b) +#define CMOCKA_PRINTF_ATTRIBUTE(a,b) #endif /* __GNUC__ */ /** @@ -1754,10 +1755,10 @@ int _run_test( int _run_tests(const UnitTest * const tests, const size_t number_of_tests); /* Standard output and error print methods. */ -void print_message(const char* const format, ...) PRINTF_ATTRIBUTE(1, 2); -void print_error(const char* const format, ...) PRINTF_ATTRIBUTE(1, 2); -void vprint_message(const char* const format, va_list args) PRINTF_ATTRIBUTE(1, 0); -void vprint_error(const char* const format, va_list args) PRINTF_ATTRIBUTE(1, 0); +void print_message(const char* const format, ...) CMOCKA_PRINTF_ATTRIBUTE(1, 2); +void print_error(const char* const format, ...) CMOCKA_PRINTF_ATTRIBUTE(1, 2); +void vprint_message(const char* const format, va_list args) CMOCKA_PRINTF_ATTRIBUTE(1, 0); +void vprint_error(const char* const format, va_list args) CMOCKA_PRINTF_ATTRIBUTE(1, 0); /** @} */ |