From 0dbce65a7a2058ace5373d568782c683d43bd0ba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 15 Dec 2019 17:08:24 +0100 Subject: [PATCH 1/2] 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 Reviewed-by: Uri Simchoni Reviewed-by: Andreas Schneider (cherry picked from commit f8799bf076d647d73aa749f3864d022a366c3904) --- 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 + 6 files changed, 6 insertions(+) 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 #include +#include #include #include 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 #include +#include #include #include diff --git a/lib/ldb/tests/ldb_lmdb_size_test.c b/lib/ldb/tests/ldb_lmdb_size_test.c index af015fa72b5..cd7ab03a1f0 100644 --- a/lib/ldb/tests/ldb_lmdb_size_test.c +++ b/lib/ldb/tests/ldb_lmdb_size_test.c @@ -43,6 +43,7 @@ */ #include #include +#include #include #include 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 #include +#include #include #include 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 #include +#include #include #include diff --git a/lib/ldb/tests/test_ldb_dn.c b/lib/ldb/tests/test_ldb_dn.c index 05f30e4ac67..000ffa72796 100644 --- a/lib/ldb/tests/test_ldb_dn.c +++ b/lib/ldb/tests/test_ldb_dn.c @@ -19,6 +19,7 @@ #include #include +#include #include #include -- 2.24.1 From 4eba407721ff3be8937f3623369375c8d54fa666 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 16 Dec 2019 10:28:53 +0100 Subject: [PATCH 2/2] source4/utils/oLschema2ldif: include stdint.h before cmocka.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Uri Simchoni Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Wed Dec 18 16:57:52 UTC 2019 on sn-devel-184 (cherry picked from commit 1bfb384018deb2ee5c27dbea9fa2cdd98901fdcc) --- source4/utils/oLschema2ldif/test.c | 1 + 1 file changed, 1 insertion(+) 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 #include +#include #include #include -- 2.24.1