1From cd4525d760c6f88c9bf85f7bf488da79cd0d3264 Mon Sep 17 00:00:00 2001
2From: Fathi Boudra <fabo@debian.org>
3Date: Wed, 7 Sep 2016 12:58:47 +0300
4Subject: [PATCH] Fix implicit declaration of stlcat/strlcopy functions
5
6Upstream-Status: Inappropriate
7---
8 adb/adb.c                | 1 +
9 fs_mgr/fs_mgr_fstab.c    | 2 +-
10 include/cutils/sockets.h | 2 +-
11 3 files changed, 3 insertions(+), 2 deletions(-)
12
13diff --git a/adb/adb.c b/adb/adb.c
14index e0f7ecde45..aaefd9b401 100644
15--- a/adb/adb.c
16+++ b/adb/adb.c
17@@ -41,6 +41,7 @@
18 #include <sys/prctl.h>
19 #include <getopt.h>
20 #include <selinux/selinux.h>
21+#include <grp.h>
22 #else
23 #include "usb_vendors.h"
24 #endif
25diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c
26index edd9591164..9ddb4643b5 100644
27--- a/fs_mgr/fs_mgr_fstab.c
28+++ b/fs_mgr/fs_mgr_fstab.c
29@@ -17,7 +17,7 @@
30 #include <ctype.h>
31 #include <stdio.h>
32 #include <stdlib.h>
33-#include <string.h>
34+#include <bsd/string.h>
35 #include <sys/mount.h>
36
37 #include "fs_mgr_priv.h"
38diff --git a/include/cutils/sockets.h b/include/cutils/sockets.h
39index daf43ec944..d3270c69e7 100644
40--- a/include/cutils/sockets.h
41+++ b/include/cutils/sockets.h
42@@ -19,7 +19,7 @@
43
44 #include <errno.h>
45 #include <stdlib.h>
46-#include <string.h>
47+#include <bsd/string.h>
48 #include <stdbool.h>
49
50 #ifdef HAVE_WINSOCK
51