Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4b4e713 authored Sep 14, 2021 by Colin Cross

Fix system/bt compiling against musl

Use the standards-compliant poll.h instead of sys/poll.h.  Add some
missing includes that were being provided transitively.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: Ie7698a83fa0d97e7963c627f4c6d621b98264038

parent 401f9c32

system/btcore/src/device_class.cc

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@

	#include <arpa/inet.h>		#include <arpa/inet.h>
	#include <base/logging.h>		#include <base/logging.h>
			#include <endian.h>
	#include <string.h>		#include <string.h>

	#include "btcore/include/device_class.h"		#include "btcore/include/device_class.h"

system/btif/co/bta_hh_co.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,11 +21,11 @@
	#include <errno.h>		#include <errno.h>
	#include <fcntl.h>		#include <fcntl.h>
	#include <linux/uhid.h>		#include <linux/uhid.h>
			#include <poll.h>
	#include <pthread.h>		#include <pthread.h>
	#include <stdint.h>		#include <stdint.h>
	#include <stdio.h>		#include <stdio.h>
	#include <string.h>		#include <string.h>
	#include <sys/poll.h>
	#include <unistd.h>		#include <unistd.h>

	#include "bta_api.h"		#include "bta_api.h"

system/btif/src/btif_pan.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,8 +34,8 @@
	#include <linux/if_ether.h>		#include <linux/if_ether.h>
	#include <linux/if_tun.h>		#include <linux/if_tun.h>
	#include <net/if.h>		#include <net/if.h>
			#include <poll.h>
	#include <sys/ioctl.h>		#include <sys/ioctl.h>
	#include <sys/poll.h>
	#include <unistd.h>		#include <unistd.h>

	#include "bt_target.h" // Must be first to define build configuration		#include "bt_target.h" // Must be first to define build configuration

system/btif/src/btif_sock_thread.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,12 +33,12 @@
	#include <errno.h>		#include <errno.h>
	#include <fcntl.h>		#include <fcntl.h>
	#include <features.h>		#include <features.h>
			#include <poll.h>
	#include <pthread.h>		#include <pthread.h>
	#include <signal.h>		#include <signal.h>
	#include <stdio.h>		#include <stdio.h>
	#include <stdlib.h>		#include <stdlib.h>
	#include <string.h>		#include <string.h>
	#include <sys/poll.h>
	#include <sys/select.h>		#include <sys/select.h>
	#include <sys/socket.h>		#include <sys/socket.h>
	#include <sys/types.h>		#include <sys/types.h>

system/gd/os/linux_generic/reactive_semaphore.cc

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@

	#include "reactive_semaphore.h"		#include "reactive_semaphore.h"

	#include <error.h>
	#include <string.h>		#include <string.h>
	#include <sys/eventfd.h>		#include <sys/eventfd.h>
	#include <unistd.h>		#include <unistd.h>