On 06/03/2010 03:57 AM, Bruno Haible wrote: > Hi Eric, > >> # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@ >> # if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ >> # include <sys/time.h> >> +# elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ >> +# include <pthread.h> >> # else > > Now, gnulib - not the user's code - is including this <pthread.h>, of > which you just determined that it contains a broken strtok_r and others. > I think it would reduce the damage by doing a #undef strtok_r. Like this. > Do you agree?
Yes, looks reasonable - mingw is the only platform we know of where we would be including <pthread.h>, so we can be reasonably sure that it is the likely-broken pthread.h from pthreads-win32. > +/* The pthread-win32 <pthread.h> also defines a couple of broken macros. */ s/pthread-win32/pthreads-win32/ -- Eric Blake ebl...@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
