com php-src: Fixed build failure introduced by PR #2158: TSRM/threads.m4
| From: | Bob Weinand | Date: | Sat, 29 Oct 2016 16:49:38 +0000 |
| Subject: | com php-src: Fixed build failure introduced by PR #2158: TSRM/threads.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95343@lists.php.net to get a copy of this message | ||
Commit: 36527eccbb793ef15f828ffa4261d9a862144f07
Author: Bob Weinand <bobwei9@hotmail.com> Sat, 29 Oct 2016 18:49:38 +0200
Parents: c7ec36d4fa4c70fc5bf4061efad74c55376041bb
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=36527eccbb793ef15f828ffa4261d9a862144f07
Log:
Fixed build failure introduced by PR #2158
Note: AC_TRY_LINK interprets the source as part of a main function, ending up with int main() { /*
... */ int main() { /* ... */ } ; return 0; } here - Using AC_LINK_IFELSE with AC_LANG_SOURCE
directly instead.
Bugs:
https://bugs.php.net/2158
Changed paths:
M TSRM/threads.m4
Diff:
diff --git a/TSRM/threads.m4 b/TSRM/threads.m4
index 7ef9202..57b46f2 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