From: Daniel P. Berrange Date: Mon, 15 Dec 2014 17:44:22 +0000 (+0000) Subject: Fix check for pthreads.h pollution on Mingw64 X-Git-Tag: v1.0~7201 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=71fe7f2d3d9125170d7ba33412a7af6b25283a6a;p=gnulib.git 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 --git a/ChangeLog b/ChangeLog index 9f5611d03b..36fbdf2bfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 --git a/m4/pthread.m4 b/m4/pthread.m4 index eaeb2f3720..b8e2c4c5ae 100644 --- a/m4/pthread.m4 +++ b/m4/pthread.m4 @@ -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_DEFUN([gl_PTHREAD_CHECK], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include - #ifdef strtok_r + #if defined strtok_r || defined localtime_r #error break me #endif