Attachment 8388 Details for Bug 9546 – git-am fix for master and 4.0.x.

[patch] git-am fix for master and 4.0.x.

0001-configure-Fix-bug-9546-aio_suspend-detection-on-Free.patch (text/plain), 2.04 KB, created by Jeremy Allison on 2013-01-07 20:54:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2013-01-07 20:54:36 UTC

Size: 2.04 KB

patch

obsolete

>From ef2e6d1d0c1e7c8a20b575a1c31ba3f4f4d11324 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Mon, 7 Jan 2013 12:53:27 -0800
>Subject: [PATCH] configure: Fix bug 9546, aio_suspend detection on FreeBSD
>
>NULL is not defined without some includes
>
>Reviewed by: Jeremy Allison <jra@samba.org>
>---
> source3/configure.in | 2 +-
> source3/wscript      | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/configure.in b/source3/configure.in
>index bd3bffe..4bab6e5 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 9a1cd68..6198c97 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:
>-- 
>1.8.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 9546: 8387 | 8388 | 8397