am 45ae15f9: am 49c381af: am 8e192f62: Merge "Fix Windows strlcpy.c build."

* commit '45ae15f9002cdd9117ac10079b112b987dc43717':
  Fix Windows strlcpy.c build.
This commit is contained in:
Elliott Hughes 2015-04-03 14:52:47 +00:00 committed by Android Git Automerger
commit 1a0c61cce4
1 changed files with 1 additions and 2 deletions

View File

@ -14,11 +14,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <features.h>
#include <sys/types.h>
#if defined(__GLIBC__) || defined(_WIN32)
#include <sys/types.h>
#include <string.h>
#include <cutils/memory.h>