diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2018-08-18 09:43:00 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2018-08-24 17:22:09 +0200 |
| commit | 7c89edfe54b0c5b44635c27371eeb29370270448 (patch) | |
| tree | 5afdd16cec67c02edc6d200cb837ac0330a9f33a /libcli | |
| parent | 6fb80cbffb9cb8cba6abc3fbce228811d36e8c9a (diff) | |
| download | samba-7c89edfe54b0c5b44635c27371eeb29370270448.tar.gz | |
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@t-online.de>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Aug 24 17:22:10 CEST 2018 on sn-devel-144
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/auth/tests/ntlm_check.c | 1 | ||||
| -rw-r--r-- | libcli/smb/test_smb1cli_session.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libcli/auth/tests/ntlm_check.c b/libcli/auth/tests/ntlm_check.c index e87a0a276d4..65c7b086008 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 d1e21d5431e..6a526c96b61 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> |