1[PATCH] Fix build issue with musl 2 3arpa/nameser.h doesn't use the same macro name to avoid several 4inclusions. 5 6Finally had an issue with framebuffer_service.c since it was missing the 7TEMP_FAILURE_RETRY macro. 8 9Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> 10--- 11 core/adbd/arpa_nameser.h | 12 +++++++++--- 12 core/adbd/base64.c | 1 - 13 core/adbd/framebuffer_service.c | 1 + 14 core/adbd/qemu_pipe.h | 1 - 15 core/include/cutils/android_reboot.h | 8 ++++++-- 16 core/include/cutils/bitops.h | 10 ++++++---- 17 core/include/cutils/partition_utils.h | 8 ++++++-- 18 extras/ext4_utils/sha1.c | 3 --- 19 extras/ext4_utils/sha1.h | 13 ++++++------- 20 9 files changed, 34 insertions(+), 23 deletions(-) 21 22diff --git a/core/adbd/arpa_nameser.h b/core/adbd/arpa_nameser.h 23index 438dc04..b2a28d6 100644 24--- a/core/adbd/arpa_nameser.h 25+++ b/core/adbd/arpa_nameser.h 26@@ -52,6 +52,8 @@ 27 28 #ifndef _ARPA_NAMESER_H_ 29 #define _ARPA_NAMESER_H_ 30+#ifndef _ARPA_NAMESER_H 31+#define _ARPA_NAMESER_H 32 33 #define BIND_4_COMPAT 34 35@@ -574,4 +579,5 @@ __END_DECLS 36 #define XLOG(...) do {} while (0) 37 #endif 38 39+#endif /* !_ARPA_NAMESER_H */ 40 #endif /* !_ARPA_NAMESER_H_ */ 41diff --git a/core/adbd/framebuffer_service.c b/core/adbd/framebuffer_service.c 42index 20c08d2..48e0241 100644 43--- a/core/adbd/framebuffer_service.c 44+++ b/core/adbd/framebuffer_service.c 45@@ -26,6 +26,7 @@ 46 #include "fdevent.h" 47 #include "adb.h" 48 49+#include <cutils/fs.h> 50 #include <linux/fb.h> 51 #include <sys/ioctl.h> 52 #include <sys/mman.h> 53-- 542.6.1 55