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