resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp am: b74b4ad38f
am: df64c96f01

* commit 'df64c96f01b3dd2a823d6aa788653c3bedd1efda':
  Make dhcpcd-6.8.2 admit that it uses BSD extensions.

Change-Id: Ibcc09804d01f0105a14ad07615e39d8007b5d5cf
diff --git a/Android.mk b/Android.mk
index 8a5a9b2..36ab085 100644
--- a/Android.mk
+++ b/Android.mk
@@ -52,6 +52,8 @@
 LOCAL_SRC_FILES += script-stub.c
 endif
 
+LOCAL_CFLAGS += -D_BSD_SOURCE
+
 ifeq ($(DHCPCD_USE_IPV6), yes)
 LOCAL_SRC_FILES += ipv6.c ipv6nd.c dhcp6.c
 LOCAL_SRC_FILES += crypt/sha256.c