diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2016-10-29 18:50:06 +0200 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2016-10-29 18:50:06 +0200 |
commit | be6bf71274a4670d7c7f45142890eb0651359c64 (patch) | |
tree | 121ef49eb5a4a1f26c703b5c61de2f5ca743fca3 /TSRM | |
parent | 87cb91ea7c0c3b864042965b6b893a690df08df7 (diff) | |
parent | 36527eccbb793ef15f828ffa4261d9a862144f07 (diff) | |
download | php-git-be6bf71274a4670d7c7f45142890eb0651359c64.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'TSRM')
-rw-r--r-- | TSRM/threads.m4 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/TSRM/threads.m4 b/TSRM/threads.m4 index 7ef920231c..57b46f251a 100644 --- a/TSRM/threads.m4 +++ b/TSRM/threads.m4 @@ -66,10 +66,9 @@ dnl dnl Check whether the current setup can use POSIX threads calls dnl AC_DEFUN([PTHREADS_CHECK_COMPILE], [ -AC_TRY_LINK( [ +AC_LINK_IFELSE([ AC_LANG_SOURCE([ #include <pthread.h> #include <stddef.h> - ], [ void *thread_routine(void *data) { return data; @@ -81,7 +80,7 @@ int main() { int data = 1; pthread_mutexattr_init(&mattr); return pthread_create(&thd, NULL, thread_routine, &data); -} ], [ +} ]) ], [ pthreads_checked=yes ], [ pthreads_checked=no |