[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  2b130b4 WHATSNEW: Update changes since rc5.
       via  225dcb2 examples: fix build on AIX6
      from  cdbf43c WHATSNEW: Update changes since rc5.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 2b130b4c0f0ad06ffd4a2f180dc1622f9d15b131
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Nov 22 09:06:28 2012 +0100

    WHATSNEW: Update changes since rc5.
    
    Karolin
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Thu Nov 22 10:48:41 CET 2012 on sn-devel-104

commit 225dcb24501821fa45cf789c18b85543a70e9422
Author: Christian Ambach <ambi at samba.org>
Date:   Tue Nov 20 09:50:15 2012 +0100

    examples: fix build on AIX6
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Tue Nov 20 16:06:59 CET 2012 on sn-devel-104
    
    Fix bug #9413 - waf build fails on AIX6.

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

Summary of changes:
 WHATSNEW.txt                         |    1 +
 examples/libsmbclient/testfstatvfs.c |    2 ++
 examples/libsmbclient/teststatvfs.c  |    2 ++
 3 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 46f08c0..4285b5c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -176,6 +176,7 @@ o   Jeremy Allison <jra at samba.org>
 o   Christian Ambach <ambi at samba.org>
     * BUG 9178: Add DMAPI configure option and checks.
     * BUG 9411: aio read marks the file as modified.
+    * BUG 9413: Fix waf build on AIX6.
 
 
 o   Sumit Bose <sbose at redhat.com>
diff --git a/examples/libsmbclient/testfstatvfs.c b/examples/libsmbclient/testfstatvfs.c
index 2442404..512563f 100644
--- a/examples/libsmbclient/testfstatvfs.c
+++ b/examples/libsmbclient/testfstatvfs.c
@@ -86,8 +86,10 @@ int main(int argc, char * argv[])
                    (unsigned long long) statvfsbuf.f_ffree);
             printf("Available Files: %llu\n",
                    (unsigned long long) statvfsbuf.f_favail);
+#ifdef HAVE_FSID_INT
             printf("File System ID: %lu\n",
                    (unsigned long) statvfsbuf.f_fsid);
+#endif
             printf("\n");
 
             printf("Flags: 0x%lx\n", statvfsbuf.f_flag);
diff --git a/examples/libsmbclient/teststatvfs.c b/examples/libsmbclient/teststatvfs.c
index 5c69122..2f656d5 100644
--- a/examples/libsmbclient/teststatvfs.c
+++ b/examples/libsmbclient/teststatvfs.c
@@ -58,8 +58,10 @@ int main(int argc, char * argv[])
                    (unsigned long long) statvfsbuf.f_ffree);
             printf("Available Files: %llu\n",
                    (unsigned long long) statvfsbuf.f_favail);
+#ifdef HAVE_FSID_INT
             printf("File System ID: %lu\n",
                    (unsigned long) statvfsbuf.f_fsid);
+#endif
             printf("\n");
 
             printf("Flags: 0x%lx\n", statvfsbuf.f_flag);


-- 
Samba Shared Repository