From 56c5ea9cdda14b18cf925dfec00dca31b7dba740 Mon Sep 17 00:00:00 2001 From: Oliver Beckstein Date: Fri, 18 Sep 2020 16:59:01 -0700 Subject: [PATCH] ensure that unistd.h is included for spe.c with recent clang - fix #2934 - use unistd.h in ENCORE's spe.c when not WIN32 (e.g. __unix__ or __APPLE__ but to be consistent with other uses in the code base we do not specifically test for __unix__ || __APPLE__) - update CHANGELOG --- package/CHANGELOG | 4 +++- .../analysis/encore/dimensionality_reduction/src/spe.c | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/CHANGELOG b/package/CHANGELOG index 90d2dc6922d..a069ed65907 100644 --- a/package/CHANGELOG +++ b/package/CHANGELOG @@ -53,7 +53,9 @@ Fixes * libmdaxdr and libdcd classes in their last frame can now be pickled (Issue #2878, PR #2911) * AtomGroup now are pickled/unpickled without looking for its anchored - Universe (PR #2893) + Universe (PR #2893) + * ensure that unistd.h is included on macOS when compiling ENCORE's spe.c + (Issue #2934) Enhancements * Refactored analysis.helanal into analysis.helix_analysis diff --git a/package/MDAnalysis/analysis/encore/dimensionality_reduction/src/spe.c b/package/MDAnalysis/analysis/encore/dimensionality_reduction/src/spe.c index 7d129bcfd79..f3ae089a7c2 100644 --- a/package/MDAnalysis/analysis/encore/dimensionality_reduction/src/spe.c +++ b/package/MDAnalysis/analysis/encore/dimensionality_reduction/src/spe.c @@ -27,12 +27,10 @@ #include #include -#ifdef __unix__ - #include -#endif - #ifdef _WIN32 #include +#else /* unix-like __unix__ || __APPLE__ */ + #include #endif #define EPSILON 1e-8