From 5a119335f700251983d9c7da31bdfe17532334b2 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 10 Dec 2014 10:05:21 -0800 Subject: Reset to master. Various automerger/conflict resolution shenanigans have made this branch no longer match AOSP. Bring them back into sync. Change-Id: I4117ea6a323068945f237edc0ce0f51e171d4bae --- host/include/llvm/Config/config.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'host') diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h index 052adab..cb3d4a3 100644 --- a/host/include/llvm/Config/config.h +++ b/host/include/llvm/Config/config.h @@ -144,11 +144,13 @@ /* Define to 1 if you have the `fmodf' function. */ #define HAVE_FMODF 1 +#ifdef __APPLE__ /* Define to 1 if you have the `futimes' function. */ #define HAVE_FUTIMES 1 - +#else /* Define to 1 if you have the `futimens' function. */ -/* #undef HAVE_FUTIMENS */ +#define HAVE_FUTIMENS 1 +#endif // __APPLE__ /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 -- cgit v1.1