CDRIVER-4654 Fix missing aligned_alloc() on Android (#1286)

JMLX42 · Jean-Marc Le Roux · eramongodb · eramongodb · commit 5f16b6a61bd8 · 2023-06-06T12:42:53.000-05:00
* CDRIVER-4654 Fix missing aligned_alloc() on Android * chore: fix coding style Co-authored-by: Ezra Chung <88335979+eramongodb@users.noreply.github.com> --------- Co-authored-by: Jean-Marc Le Roux <jmlx@Enterprise-C> Co-authored-by: Ezra Chung <88335979+eramongodb@users.noreply.github.com>
diff --git a/src/libbson/src/bson/bson-memory.c b/src/libbson/src/bson/bson-memory.c
@@ -33,7 +33,8 @@ BSON_STATIC_ASSERT2 (bson_mem_vtable_t,
 // For compatibility with C standards prior to C11.
 static void *
 _aligned_alloc_impl (size_t alignment, size_t num_bytes)
-#if __STDC_VERSION__ >= 201112L && !defined(_WIN32)
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
+   !defined(_WIN32) && !defined(__ANDROID__)
 {
    return aligned_alloc (alignment, num_bytes);
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ BSON_STATIC_ASSERT2 (bson_mem_vtable_t,`
`33`	`33`	`// For compatibility with C standards prior to C11.`
`34`	`34`	`static void *`
`35`	`35`	`_aligned_alloc_impl (size_t alignment, size_t num_bytes)`
`36`		`-#if __STDC_VERSION__ >= 201112L && !defined(_WIN32)`
	`36`	`+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \`
	`37`	`+ !defined(_WIN32) && !defined(__ANDROID__)`
`37`	`38`	`{`
`38`	`39`	`return aligned_alloc (alignment, num_bytes);`
`39`	`40`	`}`