From: Jin Qian <jinqian@google.com>
Date: Tue, 6 Dec 2016 01:49:41 +0000 (-0800)
Subject: Fix windows and mac build
X-Git-Tag: v1.44.0-rc1~101
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=43f927f7aa259c1deca0ec5855b1e5d23cb7f9e0;p=tools%2Fe2fsprogs.git

Fix windows and mac build

malloc.h is not available on mac.
mntent.h and setmntent are not available on windows.

Test: cd external/e2fsprogs && mm

Change-Id: I3bc1b80156d3659f4d81975626a71f58d39ee61a
(cherry picked from commit 8ca6180b52349968daf601bd89e15491eb2f271f)
---

diff --git a/util/android_config.h b/util/android_config.h
index a1c028f..bcf8122 100644
--- a/util/android_config.h
+++ b/util/android_config.h
@@ -1,4 +1,6 @@
+#ifndef __APPLE__
 #define HAVE_MALLOC_H 1
+#endif
 
 #define ROOT_SYSCONFDIR "/etc"
 
@@ -20,7 +22,9 @@
 #define HAVE_LSEEK64_PROTOTYPE 1
 #endif
 #define HAVE_MMAP 1
+#ifdef __linux__
 #define HAVE_MNTENT_H 1
+#endif
 #define HAVE_NETINET_IN_H 1
 #define HAVE_NET_IF_H 1
 #define HAVE_POSIX_MEMALIGN 1
@@ -33,7 +37,9 @@
 #define HAVE_PWRITE64 1
 #endif
 #define HAVE_SETJMP_H 1
+#ifdef __linux__
 #define HAVE_SETMNTENT 1
+#endif
 #define HAVE_SNPRINTF 1
 #define HAVE_STDLIB_H 1
 #define HAVE_STRCASECMP 1