[SCM] Samba Shared Repository - branch master updated

Andreas Schneider asn at samba.org
Wed Dec 18 16:58:05 UTC 2019


The branch, master has been updated
       via  1bfb384018d source4/utils/oLschema2ldif: include stdint.h before cmocka.h
       via  f8799bf076d lib/ldb/tests: include stdint.h before cmocka.h
      from  f0eb1e623f7 Avoiding bad call flags with python 3.8, using METH_NOARGS instead of zero.

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


- Log -----------------------------------------------------------------
commit 1bfb384018deb2ee5c27dbea9fa2cdd98901fdcc
Author: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Date:   Mon Dec 16 10:28:53 2019 +0100

    source4/utils/oLschema2ldif: include stdint.h before cmocka.h
    
    This fix the following build failure:
    
    In file included from /home/fabrice/buildroot/output/host/opt/ext-toolchain/lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/include/stdint.h:9:0,
                     from /home/fabrice/buildroot/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/inttypes.h:27,
                     from ../../lib/replace/../replace/replace.h:64,
                     from ../../source4/include/includes.h:23,
                     from ../../source4/utils/oLschema2ldif/test.c:25:
    /home/fabrice/buildroot/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 ../../source4/utils/oLschema2ldif/test.c:23:0:
    /home/fabrice/buildroot/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/cmocka.h:132:28: note: previous declaration of ‘uintptr_t’ was here
           typedef unsigned int uintptr_t;
    
    Fixes:
     - http://autobuild.buildroot.org/results/9507739b3d5d51024ee9c60b74c2f85d5004e7e2
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14218
    
    Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Dec 18 16:57:52 UTC 2019 on sn-devel-184

commit f8799bf076d647d73aa749f3864d022a366c3904
Author: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Date:   Sun Dec 15 17:08:24 2019 +0100

    lib/ldb/tests: include stdint.h before cmocka.h
    
    This fix the following build failures:
    
    [2466/3864] Linking bin/default/lib/ldb/ldbmodify
    In file included from /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/include/stdint.h:9:0,
                     from ../../lib/tevent/tevent.h:31,
                     from ../../lib/ldb/include/ldb.h:51,
                     from ../../lib/ldb/tests/test_ldb_dn.c:25:
    /home/buildroot/autobuild/instance-0/output-1/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/test_ldb_dn.c:23:0:
    /home/buildroot/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/cmocka.h:132:28: note: previous declaration of 'uintptr_t' was here
           typedef unsigned int uintptr_t;
                                ^
    
    In file included from /home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/include/stdint.h:9:0,
                     from ../../lib/tevent/tevent.h:31,
                     from ../../lib/ldb/tests/ldb_key_value_test.c:48:
    /home/buildroot/autobuild/instance-0/output-1/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_key_value_test.c:43:0:
    /home/buildroot/autobuild/instance-0/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/cmocka.h:132:28: note: previous declaration of 'uintptr_t' was here
           typedef unsigned int uintptr_t;
                                ^
    
    Fixes:
     - http://autobuild.buildroot.org/results/9507739b3d5d51024ee9c60b74c2f85d5004e7e2
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14218
    
    Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 lib/ldb/tests/ldb_key_value_sub_txn_test.c | 1 +
 lib/ldb/tests/ldb_key_value_test.c         | 1 +
 lib/ldb/tests/ldb_lmdb_size_test.c         | 1 +
 lib/ldb/tests/ldb_lmdb_test.c              | 1 +
 lib/ldb/tests/ldb_no_lmdb_test.c           | 1 +
 lib/ldb/tests/test_ldb_dn.c                | 1 +
 source4/utils/oLschema2ldif/test.c         | 1 +
 7 files changed, 7 insertions(+)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/tests/ldb_key_value_sub_txn_test.c b/lib/ldb/tests/ldb_key_value_sub_txn_test.c
index e71f81b866e..1eafd2d79e9 100644
--- a/lib/ldb/tests/ldb_key_value_sub_txn_test.c
+++ b/lib/ldb/tests/ldb_key_value_sub_txn_test.c
@@ -37,6 +37,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/lib/ldb/tests/ldb_key_value_test.c b/lib/ldb/tests/ldb_key_value_test.c
index 3f31bb98350..458452e5dc4 100644
--- a/lib/ldb/tests/ldb_key_value_test.c
+++ b/lib/ldb/tests/ldb_key_value_test.c
@@ -39,6 +39,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/lib/ldb/tests/ldb_lmdb_size_test.c b/lib/ldb/tests/ldb_lmdb_size_test.c
index c0c4fe87204..95eba878ba7 100644
--- a/lib/ldb/tests/ldb_lmdb_size_test.c
+++ b/lib/ldb/tests/ldb_lmdb_size_test.c
@@ -43,6 +43,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/lib/ldb/tests/ldb_lmdb_test.c b/lib/ldb/tests/ldb_lmdb_test.c
index 78758bbbe16..798a1916281 100644
--- a/lib/ldb/tests/ldb_lmdb_test.c
+++ b/lib/ldb/tests/ldb_lmdb_test.c
@@ -40,6 +40,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/lib/ldb/tests/ldb_no_lmdb_test.c b/lib/ldb/tests/ldb_no_lmdb_test.c
index 8e5a6eee8d2..be23d744004 100644
--- a/lib/ldb/tests/ldb_no_lmdb_test.c
+++ b/lib/ldb/tests/ldb_no_lmdb_test.c
@@ -40,6 +40,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/lib/ldb/tests/test_ldb_dn.c b/lib/ldb/tests/test_ldb_dn.c
index 109ee53c8ab..6faff9b7de7 100644
--- a/lib/ldb/tests/test_ldb_dn.c
+++ b/lib/ldb/tests/test_ldb_dn.c
@@ -19,6 +19,7 @@
 
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
diff --git a/source4/utils/oLschema2ldif/test.c b/source4/utils/oLschema2ldif/test.c
index 6748ce08c33..3834ea462fd 100644
--- a/source4/utils/oLschema2ldif/test.c
+++ b/source4/utils/oLschema2ldif/test.c
@@ -19,6 +19,7 @@
 
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list