diff options
| author | Dan Albert <danalbert@google.com> | 2016-09-12 22:18:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-12 22:18:33 +0000 |
| commit | 4bcb9c0a4d400aea49df5f1f87a2e842025283f4 (patch) | |
| tree | 9c8a83a351f048127dcbed32a99722fe9e266001 | |
| parent | 9f0f43d54853561c54d4fd224df46bf5c420f411 (diff) | |
| parent | 5f451c9f14717dd83e05ff10da5e86da618472c7 (diff) | |
| download | eigen-4bcb9c0a4d400aea49df5f1f87a2e842025283f4.tar.gz | |
Merge "Don't use posix_memalign." am: 110f39b259 am: 29677c00db am: fa2a1a5b22
am: 5f451c9f14
Change-Id: I80926dffc2eca4ed4f94a0e5e07a1a02f3638cec
| -rw-r--r-- | Eigen/src/Core/util/Memory.h | 2 |
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 |