buildroot

[PATCH] Fix build issue with musl

​

cdefs.h header doesn't exist in musl toolchains:

http://wiki.musl-libc.org/wiki/FAQ

​

Also arpa/nameser.h doesn't use the same macro name to avoid several

inclusions.

​

Finally had an issue with framebuffer_service.c since it was missing the

TEMP_FAILURE_RETRY macro.

​

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>

---

 core/adbd/arpa_nameser.h              | 12 +++++++++---

 core/adbd/base64.c                    |  1 -

 core/adbd/framebuffer_service.c       |  1 +

 core/adbd/qemu_pipe.h                 |  1 -

 core/include/cutils/android_reboot.h  |  8 ++++++--

 core/include/cutils/bitops.h          | 10 ++++++----

 core/include/cutils/partition_utils.h |  8 ++++++--

 extras/ext4_utils/sha1.c              |  3 ---

 extras/ext4_utils/sha1.h              | 13 ++++++-------

 9 files changed, 34 insertions(+), 23 deletions(-)

​

diff --git a/core/adbd/arpa_nameser.h b/core/adbd/arpa_nameser.h

index 438dc04..b2a28d6 100644

--- a/core/adbd/arpa_nameser.h

+++ b/core/adbd/arpa_nameser.h

@@ -52,11 +52,12 @@

 #ifndef _ARPA_NAMESER_H_

 #define _ARPA_NAMESER_H_

+#ifndef _ARPA_NAMESER_H

+#define _ARPA_NAMESER_H

 #define BIND_4_COMPAT

 #include <sys/types.h>

-#include <sys/cdefs.h>

 /*

  * Revision information.  This is the release date in YYYYMMDD format.

@@ -505,7 +506,9 @@ typedef enum __ns_cert_types {

 #define    ns_makecanon        __ns_makecanon

 #define    ns_samename     __ns_samename

-__BEGIN_DECLS

+#ifdef __cplusplus

+extern "C" {

+#endif

 int        ns_msg_getflag(ns_msg, int);

 uint16_t   ns_get16(const u_char *);

 uint32_t   ns_get32(const u_char *);

@@ -560,7 +563,9 @@ int     ns_samedomain(const char *, const char *);

 int        ns_subdomain(const char *, const char *);

 int        ns_makecanon(const char *, char *, size_t);

 int        ns_samename(const char *, const char *);

-__END_DECLS

+#ifdef __cplusplus

+}

+#endif

 #ifdef BIND_4_COMPAT