diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2019-12-15 17:08:24 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-01-14 08:30:24 +0000 |
| commit | 3889444e00866eafebcdfb42be5f07990b881c56 (patch) | |
| tree | caa2074eec64f01693ee9908d82112d1020f5a63 /lib | |
| parent | 67e429d86aed47f36a2bf8c05ae2e47e356bfa12 (diff) | |
| download | samba-3889444e00866eafebcdfb42be5f07990b881c56.tar.gz | |
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@gmail.com>
Reviewed-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit f8799bf076d647d73aa749f3864d022a366c3904)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ldb/tests/ldb_key_value_sub_txn_test.c | 1 | ||||
| -rw-r--r-- | lib/ldb/tests/ldb_key_value_test.c | 1 | ||||
| -rw-r--r-- | lib/ldb/tests/ldb_lmdb_size_test.c | 1 | ||||
| -rw-r--r-- | lib/ldb/tests/ldb_lmdb_test.c | 1 | ||||
| -rw-r--r-- | lib/ldb/tests/ldb_no_lmdb_test.c | 1 | ||||
| -rw-r--r-- | lib/ldb/tests/test_ldb_dn.c | 1 |
6 files changed, 6 insertions, 0 deletions
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 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 <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 05f30e4ac67..000ffa72796 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> |