[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  7c89edf Fix uClibc build on 64bit platforms by including stdint.h
      from  6fb80cb ctdb-tests: Check that no IPs are assigned when failover is disabled

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


- Log -----------------------------------------------------------------
commit 7c89edfe54b0c5b44635c27371eeb29370270448
Author: Bernd Kuhls <bernd.kuhls at t-online.de>
Date:   Sat Aug 18 09:43:00 2018 +0200

    Fix uClibc build on 64bit platforms by including stdint.h
    
    Fixes an error detected by buildroot autobuilders:
    http://autobuild.buildroot.net/results/573/573e2268e205e10d1352fa81122d8f225fdb4575/build-end.log
    
    /home/rclinux/rc-buildroot-test/scripts/instance-1/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27:
    error: conflicting types for 'uintptr_t'
     typedef unsigned long int uintptr_t;
                               ^
    In file included from ../lib/ldb/tests/ldb_msg.c:17:0:
    ../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here
           typedef unsigned int uintptr_t;
    
    The define __WORDSIZE is missing when cmocka.h decides how to
    define uintptr_t, this patch includes stdint.h when needed.
    
    Patch sent upstream:
    https://lists.samba.org/archive/samba-technical/2018-January/125306.html
    
    Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Fri Aug 24 17:22:10 CEST 2018 on sn-devel-144

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

Summary of changes:
 lib/ldb/tests/ldb_mod_op_test.c   | 1 +
 lib/ldb/tests/ldb_msg.c           | 1 +
 libcli/auth/tests/ntlm_check.c    | 1 +
 libcli/smb/test_smb1cli_session.c | 1 +
 4 files changed, 4 insertions(+)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
index 924c80a..52e7e90 100644
--- a/lib/ldb/tests/ldb_mod_op_test.c
+++ b/lib/ldb/tests/ldb_mod_op_test.c
@@ -13,6 +13,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/lib/ldb/tests/ldb_msg.c b/lib/ldb/tests/ldb_msg.c
index f8de418..31786a9 100644
--- a/lib/ldb/tests/ldb_msg.c
+++ b/lib/ldb/tests/ldb_msg.c
@@ -13,6 +13,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/libcli/auth/tests/ntlm_check.c b/libcli/auth/tests/ntlm_check.c
index e87a0a2..65c7b08 100644
--- a/libcli/auth/tests/ntlm_check.c
+++ b/libcli/auth/tests/ntlm_check.c
@@ -40,6 +40,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/libcli/smb/test_smb1cli_session.c b/libcli/smb/test_smb1cli_session.c
index d1e21d5..6a526c9 100644
--- a/libcli/smb/test_smb1cli_session.c
+++ b/libcli/smb/test_smb1cli_session.c
@@ -1,5 +1,6 @@
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 


-- 
Samba Shared Repository