# HG changeset patch # User Daniel P. Berrange # Date 1418665462 0 # Node ID 10c7c458ab22f7b6739d43a8d2fffdca33e52cae # Parent d89bcacfc85767a0c9411d4c4beb5975cc3a68ae Fix check for pthreads.h pollution on Mingw64 A previous commit attempted to workaround pollution in the Mingw64 pthreads.h header file commit d5fec6c22f03c6a73d62260c9ce091c10c0a9cbd Author: Eric Blake Date: Wed Jan 22 20:39:45 2014 -0700 pthread: work around winpthread header pollution on mingw It activated its workaround based on existance of the strtok_r wrapper in pthreads.h. As luck would have it, latest Mingw64 headers removed the strtok_r wrapper from pthreads.h, but left all the others. So the gnulib workaround was not activated. Change the configure check to look for several of the broken wrappers, instead of just strtok_r Signed-off-by: Eric Blake diff -r d89bcacfc857 -r 10c7c458ab22 ChangeLog --- a/ChangeLog Sat Jan 03 15:21:54 2015 -0800 +++ b/ChangeLog Mon Dec 15 17:44:22 2014 +0000 @@ -1,3 +1,9 @@ +2015-01-05 Daniel P. Berrange (tiny change) + + pthread: detect git mingw builds with only partial pollution + * m4/pthread.m4 (gl_PTHREAD_CHECK): Check for additional + pollution, as seen temporarily in Fedora 21. + 2015-01-04 Paul Eggert lib-symbol-versions: cache script check diff -r d89bcacfc857 -r 10c7c458ab22 m4/pthread.m4 --- a/m4/pthread.m4 Sat Jan 03 15:21:54 2015 -0800 +++ b/m4/pthread.m4 Mon Dec 15 17:44:22 2014 +0000 @@ -1,4 +1,4 @@ -# pthread.m4 serial 9 +# pthread.m4 serial 10 dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include - #ifdef strtok_r + #if defined strtok_r || defined localtime_r #error break me #endif