commit ccbfe4921abfbae218068b90dd46bf4197dc6685
author David Anderson <dvander@google.com> Wed Jul 25 16:47:25 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 25 16:47:25 2018 -0700
tree 69944aa9ed68a471815355b99e32369b183d5565
parent 37bf62cd2a88537cabb141242c32f654103bf820
parent cb39a5ac2baab22d74792cdd977ae2232d79fa41

Merge "e2fsprogs: Fix macOS build." am: 8e814b82f3 am: 24793daef2 am: ec4658e035
am: cb39a5ac2b

Change-Id: I7cd8c4aeb9987e57b3a3cc89810a8d99eb658654

lib/config.h

diff --git a/lib/config.h b/lib/config.h
index e7d78a9..6ac16fe 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -28,7 +28,9 @@
 #define HAVE_UTIME_H 1
 
 #define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_SYSMACROS_H 1
+#if !defined(__APPLE__)
+# define HAVE_SYS_SYSMACROS_H 1
+#endif
 #define HAVE_SYS_TIME_H 1
 #define HAVE_SYS_TYPES_H 1
 

util/android_config.h

diff --git a/util/android_config.h b/util/android_config.h
index e7d78a9..6ac16fe 100644
--- a/util/android_config.h
+++ b/util/android_config.h
@@ -28,7 +28,9 @@
 #define HAVE_UTIME_H 1
 
 #define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_SYSMACROS_H 1
+#if !defined(__APPLE__)
+# define HAVE_SYS_SYSMACROS_H 1
+#endif
 #define HAVE_SYS_TIME_H 1
 #define HAVE_SYS_TYPES_H 1