From bd00c80ea8c52527de3cd145dcab9b0c79f01473 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Fri, 31 Jul 2015 03:15:41 +0200 Subject: [PATCH] Aliased strtok_s to strtok_r for windows builds --- src/log/normal.c | 7 +++++++ src/log/tap.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/log/normal.c b/src/log/normal.c index 1d6609e..f1a67d6 100644 --- a/src/log/normal.c +++ b/src/log/normal.c @@ -33,6 +33,13 @@ #include "timer.h" #include "config.h" #include "i18n.h" +#include "posix-compat.h" + +#ifdef VANILLA_WIN32 +// provided by windows' libc implementation +char *strtok_s(char *strToken, const char *strDelimit, char **context); +# define strtok_r strtok_s +#endif typedef const char *const msg_t; diff --git a/src/log/tap.c b/src/log/tap.c index 822b92f..43768f7 100644 --- a/src/log/tap.c +++ b/src/log/tap.c @@ -31,6 +31,13 @@ #include "criterion/ordered-set.h" #include "timer.h" #include "config.h" +#include "posix-compat.h" + +#ifdef VANILLA_WIN32 +// provided by windows' libc implementation +char *strtok_s(char *strToken, const char *strDelimit, char **context); +# define strtok_r strtok_s +#endif void tap_log_pre_all(struct criterion_test_set *set) { size_t enabled_count = 0;