]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Fix uClibc build on 64bit platforms by including stdint.h
authorBernd Kuhls <bernd.kuhls@t-online.de>
Sat, 18 Aug 2018 07:43:00 +0000 (09:43 +0200)
committerVolker Lendecke <vl@samba.org>
Fri, 24 Aug 2018 15:22:09 +0000 (17:22 +0200)
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

lib/ldb/tests/ldb_mod_op_test.c
lib/ldb/tests/ldb_msg.c
libcli/auth/tests/ntlm_check.c
libcli/smb/test_smb1cli_session.c

index 924c80a14b7610957498c7911dbd59e908fa0388..52e7e90e60a2a263429c497321c91fbae6f036cb 100644 (file)
@@ -13,6 +13,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
index f8de418e0dcf83a2bb7cd32e62e8d3e7967aabfc..31786a9a31885c46d9909249f4f0ebdea6ae6815 100644 (file)
@@ -13,6 +13,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
index e87a0a276d4934db709dd73a8b3c8a112414ee48..65c7b086008cebf6e17c9f738c4f60248515a882 100644 (file)
@@ -40,6 +40,7 @@
  */
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
 
index d1e21d5431e99a7b96f502cc1814329c4bc84ffc..6a526c96b6143dcfd14e3b208ce531f696bc7bd9 100644 (file)
@@ -1,5 +1,6 @@
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>