|
@@ -0,0 +1,38 @@
|
|
|
+From bed8720dce64181c188c23a28506a88cd2e1ee4f Mon Sep 17 00:00:00 2001
|
|
|
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
+Date: Sat, 11 May 2019 00:07:50 +0200
|
|
|
+Subject: [PATCH] test_regfio.c: include stdint.h before cmoka.h
|
|
|
+
|
|
|
+This fix the following build failure on mips64el:
|
|
|
+/usr/lfs/v0/rc-buildroot-test/scripts/instance-2/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 ../source3/registry/tests/test_regfio.c:23:0:
|
|
|
+../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here
|
|
|
+ typedef unsigned int uintptr_t;
|
|
|
+
|
|
|
+Fixes:
|
|
|
+ - http://autobuild.buildroot.org/results/bae0508e84c905dc23ad7cf1153cd1e9d8e4d734
|
|
|
+
|
|
|
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
+[Upstream status:
|
|
|
+https://gitlab.com/samba-team/samba/merge_requests/442]
|
|
|
+---
|
|
|
+ source3/registry/tests/test_regfio.c | 1 +
|
|
|
+ 1 file changed, 1 insertion(+)
|
|
|
+
|
|
|
+diff --git a/source3/registry/tests/test_regfio.c b/source3/registry/tests/test_regfio.c
|
|
|
+index 86a217661f3..f945e653708 100644
|
|
|
+--- a/source3/registry/tests/test_regfio.c
|
|
|
++++ b/source3/registry/tests/test_regfio.c
|
|
|
+@@ -20,6 +20,7 @@
|
|
|
+ #include <stdarg.h>
|
|
|
+ #include <stddef.h>
|
|
|
+ #include <setjmp.h>
|
|
|
++#include <stdint.h>
|
|
|
+ #include <cmocka.h>
|
|
|
+
|
|
|
+ #include <errno.h>
|
|
|
+--
|
|
|
+2.20.1
|
|
|
+
|