diff options
| author | Volker Lendecke <vl@samba.org> | 2013-01-07 12:53:27 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-01-14 13:21:58 -0800 |
| commit | 584402a71a4dd4bc821a58087814a1f3c110bb65 (patch) | |
| tree | 977fd9043679064d3bf5b967aa24333dfc7a86e6 | |
| parent | e0bfb59803184c44cfc354b99ba3d8d7bbfc72b9 (diff) | |
| download | samba-584402a71a4dd4bc821a58087814a1f3c110bb65.tar.gz samba-584402a71a4dd4bc821a58087814a1f3c110bb65.tar.bz2 samba-584402a71a4dd4bc821a58087814a1f3c110bb65.zip | |
configure: Fix bug 9546, aio_suspend detection on FreeBSD
NULL is not defined without some includes
Reviewed by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/wscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 359113143b..0fa58590f5 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -5386,7 +5386,7 @@ int main() { struct aiocb a; return aio_cancel(1, &a); }])], AC_MSG_CHECKING(for aio_suspend) AC_LINK_IFELSE([AC_LANG_SOURCE([#include <aio.h> -int main() { struct aiocb a; return aio_suspend(&a, 1, NULL); }])], +int main() { struct aiocb a; struct timespec t; return aio_suspend(&a, 1, &t); }])], [AC_DEFINE(HAVE_AIO_SUSPEND, 1, [Have aio_suspend]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) else diff --git a/source3/wscript b/source3/wscript index 50787165f2..197afb60d9 100644 --- a/source3/wscript +++ b/source3/wscript @@ -471,7 +471,7 @@ return acl_get_perm_np(permset_d, perm); conf.CHECK_CODE('struct aiocb a; return aio_return(&a);', 'HAVE_AIO_RETURN', msg='Checking for aio_return', headers='aio.h', lib='aio rt') conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt') conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt') - conf.CHECK_CODE('struct aiocb a; return aio_suspend(&a, 1, NULL);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt') + conf.CHECK_CODE('struct aiocb a; struct timespec t; return aio_suspend(&a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt') if not conf.CONFIG_SET('HAVE_AIO'): conf.DEFINE('HAVE_NO_AIO', '1') else: |