mirror of
https://git.busybox.net/buildroot.git
synced 2024-12-01 01:13:29 +08:00
61fc8632d3
Removed patch which is included in this release. Renumbered remaining patches. Release notes: - https://www.samba.org/samba/history/samba-4.20.0rc1.html - https://www.samba.org/samba/history/samba-4.20.0rc2.html - https://www.samba.org/samba/history/samba-4.20.0rc3.html - https://www.samba.org/samba/history/samba-4.20.0rc4.html - https://www.samba.org/samba/history/samba-4.20.0.html - https://www.samba.org/samba/history/samba-4.20.1.html - https://www.samba.org/samba/history/samba-4.20.2.html Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From b2ea5dc3639d68b878c6534f4992da446dbbf2d4 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sat, 16 May 2020 18:15:38 +0200
|
|
Subject: [PATCH] ldap_message_test.c: include stdint.h before cmoka.h
|
|
|
|
This fix the following build failure on uclibc:
|
|
|
|
In file included from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/include/stdint.h:9:0,
|
|
from /home/giuliobenetti/autobuild/run/instance-1/output-1/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 ../../libcli/ldap/tests/ldap_message_test.c:41:
|
|
/home/giuliobenetti/autobuild/run/instance-1/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;
|
|
^
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/09e84d15efe755bdefa9f8c6b8355c49ddbc2f65
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: not sent yet]
|
|
---
|
|
libcli/ldap/tests/ldap_message_test.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/libcli/ldap/tests/ldap_message_test.c b/libcli/ldap/tests/ldap_message_test.c
|
|
index c5aacd4bc6b..51331e5c600 100644
|
|
--- a/libcli/ldap/tests/ldap_message_test.c
|
|
+++ b/libcli/ldap/tests/ldap_message_test.c
|
|
@@ -34,6 +34,7 @@
|
|
*/
|
|
#include <stdarg.h>
|
|
#include <stddef.h>
|
|
+#include <stdint.h>
|
|
#include <setjmp.h>
|
|
#include <cmocka.h>
|
|
|
|
--
|
|
2.26.2
|
|
|