aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-09-12 21:34:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-12 21:34:51 +0000
commit29677c00db4d73bcf02642d81991bf368b47a5ad (patch)
tree9c8a83a351f048127dcbed32a99722fe9e266001
parent9f0f43d54853561c54d4fd224df46bf5c420f411 (diff)
parent110f39b2599856ffe6c7781b221b93d00b89d2b4 (diff)
downloadeigen-29677c00db4d73bcf02642d81991bf368b47a5ad.tar.gz
Merge "Don't use posix_memalign."
am: 110f39b259 Change-Id: Ib43ab2c64957b7b3c5decfdd19bcdd27d2068c48
-rw-r--r--Eigen/src/Core/util/Memory.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h
index 754e29bc5..779640237 100644
--- a/Eigen/src/Core/util/Memory.h
+++ b/Eigen/src/Core/util/Memory.h
@@ -63,7 +63,7 @@
// Currently, let's include it only on unix systems:
#if defined(__unix__) || defined(__unix)
#include <unistd.h>
- #if ((defined __QNXNTO__) || (defined _GNU_SOURCE) || (defined __PGI) || ((defined _XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600))) && (defined _POSIX_ADVISORY_INFO) && (_POSIX_ADVISORY_INFO > 0)
+ #if ((defined __QNXNTO__) || (defined _GNU_SOURCE) || (defined __PGI) || ((defined _XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600))) && (defined _POSIX_ADVISORY_INFO) && (_POSIX_ADVISORY_INFO > 0) && !defined(EIGEN_ANDROID_POSIX_MEMALIGN_WR)
#define EIGEN_HAS_POSIX_MEMALIGN 1
#endif
#endif