diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tests/basic.c | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 4d16fc69..62544533 100644 --- a/configure.ac +++ b/configure.ac @@ -729,9 +729,11 @@ AC_SUBST(PTH_LIBS) # # Check whether pthreads is available # -AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes) -if test "$have_pthread" = yes; then - AC_DEFINE(HAVE_PTHREAD, 1 ,[Define if we have pthread.]) +if test "$have_w32_system" != yes; then + AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes) + if test "$have_pthread" = yes; then + AC_DEFINE(HAVE_PTHREAD, 1 ,[Define if we have pthread.]) + fi fi diff --git a/tests/basic.c b/tests/basic.c index 5fd71313..e85e4e17 100644 --- a/tests/basic.c +++ b/tests/basic.c @@ -4063,11 +4063,11 @@ check_digests (void) continue; } if (verbose) - fprintf (stderr, " checking %s [%i] for length %zi\n", + fprintf (stderr, " checking %s [%i] for length %d\n", gcry_md_algo_name (algos[i].md), algos[i].md, !strcmp (algos[i].data, "!")? - 1000000 : strlen(algos[i].data)); + 1000000 : (int)strlen(algos[i].data)); check_one_md (algos[i].md, algos[i].data, strlen (algos[i].data), algos[i].expect); @@ -4488,10 +4488,10 @@ check_hmac (void) } if (verbose) fprintf (stderr, - " checking %s [%i] for %zi byte key and %zi byte data\n", + " checking %s [%i] for %d byte key and %d byte data\n", gcry_md_algo_name (algos[i].md), algos[i].md, - strlen(algos[i].key), strlen(algos[i].data)); + (int)strlen(algos[i].key), (int)strlen(algos[i].data)); check_one_hmac (algos[i].md, algos[i].data, strlen (algos[i].data), algos[i].key, strlen(algos[i].key), @@ -5091,10 +5091,10 @@ check_mac (void) } if (verbose) fprintf (stderr, - " checking %s [%i] for %zi byte key and %zi byte data\n", + " checking %s [%i] for %d byte key and %d byte data\n", gcry_mac_algo_name (algos[i].algo), algos[i].algo, - strlen(algos[i].key), strlen(algos[i].data)); + (int)strlen(algos[i].key), (int)strlen(algos[i].data)); check_one_mac (algos[i].algo, algos[i].data, strlen (algos[i].data), algos[i].key, strlen(algos[i].key), algos[i].iv, |