[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Mon Jun 18 03:44:09 MDT 2012


The branch, master has been updated
       via  ad3881b s3:configure: check for SPLICE_F_MOVE at configure stage
      from  ede2fa8 heimdal:lib/wind: include <stdlib.h> at the end

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


- Log -----------------------------------------------------------------
commit ad3881b78c158eda36b866dc2cbaff1b4bc487d8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 18 08:49:18 2012 +0200

    s3:configure: check for SPLICE_F_MOVE at configure stage
    
    This should fix the waf build on AIX, which has a splice symbol.
    
    metze
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Mon Jun 18 11:43:01 CEST 2012 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 b6143f4..e4ce944 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5676,7 +5676,7 @@ AC_CACHE_CHECK([for Linux splice],
 #include <unistd.h>
 #endif
 #include <fcntl.h>],
-    [long ret = splice(0,0,1,0,400,0);],
+    [long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);],
     samba_cv_HAVE_LINUX_SPLICE=yes,
     samba_cv_HAVE_LINUX_SPLICE=no)])
 ;;
diff --git a/source3/wscript b/source3/wscript
index 5a8a6f0..55b859c 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -107,7 +107,7 @@ def configure(conf):
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
-long ret = splice(0,0,1,0,400,0);
+long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);
 ''',
         'HAVE_LINUX_SPLICE',
         headers='fcntl.h'):


-- 
Samba Shared Repository


More information about the samba-cvs mailing list