Skip to content

Windows: Inform compiler (GCC/MinGW) that format strings to use are GNU/c99 style #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brarcher merged 2 commits into from
Oct 22, 2021
+13 −2
Merged

Windows: Inform compiler (GCC/MinGW) that format strings to use are GNU/c99 style #339

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f3aedd
Inform compiler (MinGW) that format strings to use are GNU/c99 style,…
bradh352 Oct 18, 2021
3d2cf06
Merge branch 'master' into master
brarcher Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/check.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,20 @@ CK_CPPSTART
#if GCC_VERSION_AT_LEAST(2,95,3)
#define CK_ATTRIBUTE_UNUSED __attribute__ ((unused))
#define CK_ATTRIBUTE_FORMAT(a, b, c) __attribute__ ((format (a, b, c)))

/* We use a private snprintf implementation that does not support the Windows
* format strings of %I64u or similar and instead support the C99 and GNU format
* format strings like %llu and %zu. Let the compiler know this. */
#ifdef _WIN32
#define CK_ATTRIBUTE_FORMAT_PRINTF gnu_printf
#else
#define CK_ATTRIBUTE_FORMAT_PRINTF printf
#endif

#else
#define CK_ATTRIBUTE_UNUSED
#define CK_ATTRIBUTE_FORMAT(a, b, c)
#define CK_ATTRIBUTE_FORMAT_PRINTF printf
#endif /* GCC 2.95 */

#if GCC_VERSION_AT_LEAST(2,5,0)
Expand Down Expand Up @@ -504,11 +515,11 @@ static void __testname ## _fn (int _i CK_ATTRIBUTE_UNUSED)
#if @HAVE_FORK@
CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char *file, int line,
const char *expr, const char *msg,
...) CK_ATTRIBUTE_NORETURN CK_ATTRIBUTE_FORMAT(printf, 4, 5);
...) CK_ATTRIBUTE_NORETURN CK_ATTRIBUTE_FORMAT(CK_ATTRIBUTE_FORMAT_PRINTF, 4, 5);
#else
CK_DLL_EXP void CK_EXPORT _ck_assert_failed(const char *file, int line,
const char *expr, const char *msg,
...) CK_ATTRIBUTE_FORMAT(printf, 4, 5);
...) CK_ATTRIBUTE_FORMAT(CK_ATTRIBUTE_FORMAT_PRINTF, 4, 5);
#endif

/**
Expand Down