From: David Anderson <dvander@google.com>
Date: Wed, 25 Jul 2018 19:41:05 +0000 (-0700)
Subject: AOSP: Fix macOS build.
X-Git-Tag: v1.44.4~24
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=aa975a572dc096f006156b1b8af9a74d05a2cdc2;p=tools%2Fe2fsprogs.git

AOSP: Fix macOS build.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Bug: 111839488
Test: e2fsprogs builds on macOS.
Change-Id: I4ddf332cc244fa44f928cba68470b7f9aa48a556
From AOSP commit: 4dc2456f0e6d10c73372e829e1875ec4095e8fa6
---

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