[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  c932b13 Improve the configure tests for aio_suspend to get rid of warnings. Timur provided the wscript method, I added the configure.in correction.
      from  233b32b s3: Make SMB2_GETINFO multi-volume aware.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c932b139c8d1fc0b6a357623fe4011edabb45422
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date:   Fri Feb 8 19:56:56 2013 -0800

    Improve the configure tests for aio_suspend to get rid of warnings. Timur provided the wscript method, I added the configure.in correction.
    
    Signed-off-by: Timur Bakeyev <timur at freebsd.org>
    Signed-off-by: Richard Sharpe <realrichardsharpe at gmail.com>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Sat Feb  9 09:24:06 CET 2013 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |    2 +-
 source3/wscript      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 031a33d..1b24ad6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5387,7 +5387,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; struct timespec t; return aio_suspend(&a, 1, &t); }])],
+int main() { const struct aiocb * const [a[1]]; 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 84abf76..7a99dc1 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; struct timespec t; return aio_suspend(&a, 1, &t);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
+            conf.CHECK_CODE('const struct aiocb * const a[1]; 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:


-- 
Samba Shared Repository