Disable aligned_alloc on MacOS

Because it does not work on anadonca and older MacOS versions.
jeroen · Feb 3, 2025 · 95b09ce · 95b09ce
1 parent 4f6d011
commit 95b09ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -5,7 +5,7 @@ Description: High-performance MongoDB client based on 'mongo-c-driver' and 'json
     Includes support for aggregation, indexing, map-reduce, streaming, encryption,
     enterprise authentication, and GridFS. The online user manual provides an overview 
     of the available methods in the package: <https://jeroen.github.io/mongolite/>.
-Version: 3.0.0
+Version: 3.0.1
 Authors@R: c(
     person("Jeroen", "Ooms", ,"[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-4035-0289")),

diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+3.0.1
+ - Do not use alligned_malloc on MacOS to fix build on conda-forge
+
 3.0.0
  - Update vendored mongo-c-driver to 1.29.2
  - On Windows we need Win-7 and therefore R-4.2 or newer

diff --git a/src/bson/bson-memory.c b/src/bson/bson-memory.c
@@ -32,7 +32,7 @@ BSON_STATIC_ASSERT2 (bson_mem_vtable_t, sizeof (bson_mem_vtable_t) == sizeof (vo
 static void *
 _aligned_alloc_impl (size_t alignment, size_t num_bytes)
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(_WIN32) && !defined(__ANDROID__) && \
-   !defined(_AIX)
+   !defined(_AIX) && !defined(__APPLE__)
 {
    return aligned_alloc (alignment, num_bytes);
 }