[celix] branch develop updated: Fixed conditional define to include memstream

[pn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/develop by this push:
     new 19e73d4  Fixed conditional define to include memstream
     new f865fd2  Merge pull request #164 from bakkerv/feature/fix-memstream-available
19e73d4 is described below

commit 19e73d400a46c16803e07df97e616733d20bcb30
Author: Vincent Bakker <vi...@gmail.com>
AuthorDate: Fri Mar 6 20:47:55 2020 +0100

    Fixed conditional define to include memstream
---
 libs/dfi/include/dyn_type.h          | 2 +-
 libs/utils/include/celix_utils_api.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/dfi/include/dyn_type.h b/libs/dfi/include/dyn_type.h
index 1dff59e..53dbdf8 100644
--- a/libs/dfi/include/dyn_type.h
+++ b/libs/dfi/include/dyn_type.h
@@ -28,7 +28,7 @@
 
 #include "dfi_log_util.h"
 
-#if defined(BSD) || defined(__APPLE__) || defined(__ANDROID__)
+#if defined(NO_MEMSTREAM_AVAILABLE)
 #include "memstream/open_memstream.h"
 #include "memstream/fmemopen.h"
 #endif
diff --git a/libs/utils/include/celix_utils_api.h b/libs/utils/include/celix_utils_api.h
index 23192a2..c737bf3 100644
--- a/libs/utils/include/celix_utils_api.h
+++ b/libs/utils/include/celix_utils_api.h
@@ -32,7 +32,7 @@
 #include "version_range.h"
 #include "thpool.h"
 
-#if defined(BSD) || defined(__APPLE__) || defined(__ANDROID__)
+#if defined(NO_MEMSTREAM_AVAILABLE)
 #include "memstream/open_memstream.h"
 #include "memstream/fmemopen.h"
 #endif