From 01c3b9f3f558f72657803ef7439b6f4ca0f2f906 Mon Sep 17 00:00:00 2001 From: cathugger Date: Thu, 22 Feb 2018 00:46:06 +0000 Subject: [PATCH] attempt to support windows #2 --- filters.h | 6 +++--- main.c | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/filters.h b/filters.h index e24947b..4c096f8 100644 --- a/filters.h +++ b/filters.h @@ -396,7 +396,7 @@ static void filters_add(const char *filter) if (!re) { PCRE2_UCHAR buffer[1024]; pcre2_get_error_message(errornum,buffer,sizeof(buffer)); - fprintf(stderr,"PCRE2 compilation failed at offset %zu: %s\n", + fprintf(stderr,"PCRE2 compilation failed at offset " FSZ ": %s\n", (size_t)erroroffset,buffer); return; } @@ -640,7 +640,7 @@ static void filters_print() if (i >= 20) { size_t notshown = l - i; - fprintf(stderr,"[another %zu %s not shown]\n", + fprintf(stderr,"[another " FSZ " %s not shown]\n", notshown,notshown == 1 ? "filter" : "filters"); break; } @@ -679,5 +679,5 @@ static void filters_print() fprintf(stderr,"\t%s\n",VEC_BUF(filters,i).str); #endif // PCRE2FILTER } - fprintf(stderr,"in total, %zu %s\n",l,l == 1 ? "filter" : "filters"); + fprintf(stderr,"in total, " FSZ " %s\n",l,l == 1 ? "filter" : "filters"); } diff --git a/main.c b/main.c index 8319e04..70ead8a 100644 --- a/main.c +++ b/main.c @@ -20,6 +20,12 @@ #include "ed25519/ed25519.h" #include "ioutil.h" +#ifndef _WIN32 +#define FSZ "%zu" +#else +#define FSZ "%Iu" +#endif + // additional 0 terminator is added by C static const char * const pkprefix = "== ed25519v1-public: type0 ==\0\0"; #define pkprefixlen (29 + 3) @@ -664,7 +670,7 @@ int main(int argc,char **argv) #endif tret = pthread_create(&VEC_BUF(threads,i),0,fastkeygen ? dofastwork : dowork,tp); if (tret) { - fprintf(stderr,"error while making %zuth thread: %d\n",i,tret); + fprintf(stderr,"error while making " FSZ "th thread: %d\n",i,tret); exit(1); } }