diff options
| author | Dan Albert <danalbert@google.com> | 2014-12-10 10:05:21 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-12-10 10:05:21 -0800 |
| commit | 5a119335f700251983d9c7da31bdfe17532334b2 (patch) | |
| tree | 8fb36d3910e3ee4c4e1b7422f4f017108efc52f5 /host | |
| parent | a3a36cf628f1b0f3980bdb28c103c0e776288da9 (diff) | |
| download | external_llvm-5a119335f700251983d9c7da31bdfe17532334b2.zip external_llvm-5a119335f700251983d9c7da31bdfe17532334b2.tar.gz external_llvm-5a119335f700251983d9c7da31bdfe17532334b2.tar.bz2 | |
Reset to master.
Various automerger/conflict resolution shenanigans have made this
branch no longer match AOSP. Bring them back into sync.
Change-Id: I4117ea6a323068945f237edc0ce0f51e171d4bae
Diffstat (limited to 'host')
| -rw-r--r-- | host/include/llvm/Config/config.h | 6 |
1 files changed, 4 insertions, 2 deletions
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 |