summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-08-20 16:16:24 -0700
committerElliott Hughes <enh@google.com>2014-08-20 16:16:24 -0700
commit3ff8888f6629814bc5e09ccf9a144eaf6d7daaa1 (patch)
treeba4b57e46ea33084c687d254b78299a7dcc20e58
parentafc9bc01b4f8a239b5f1a1c695b941a7d0ab8825 (diff)
downloadsystem_core-3ff8888f6629814bc5e09ccf9a144eaf6d7daaa1.zip
system_core-3ff8888f6629814bc5e09ccf9a144eaf6d7daaa1.tar.gz
system_core-3ff8888f6629814bc5e09ccf9a144eaf6d7daaa1.tar.bz2
Only the Mac doesn't have open_memstream.
We should probably move this into art, since they're the only people using it. Bug: 17164505 Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
-rw-r--r--include/cutils/open_memstream.h4
-rw-r--r--libcutils/open_memstream.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/cutils/open_memstream.h b/include/cutils/open_memstream.h
index b7998be..c1a81eb 100644
--- a/include/cutils/open_memstream.h
+++ b/include/cutils/open_memstream.h
@@ -19,7 +19,7 @@
#include <stdio.h>
-#ifndef HAVE_OPEN_MEMSTREAM
+#if defined(__APPLE__)
#ifdef __cplusplus
extern "C" {
@@ -31,6 +31,6 @@ FILE* open_memstream(char** bufp, size_t* sizep);
}
#endif
-#endif /*!HAVE_OPEN_MEMSTREAM*/
+#endif /* __APPLE__ */
#endif /*__CUTILS_OPEN_MEMSTREAM_H__*/
diff --git a/libcutils/open_memstream.c b/libcutils/open_memstream.c
index 5b4388a..1c37321 100644
--- a/libcutils/open_memstream.c
+++ b/libcutils/open_memstream.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#ifndef HAVE_OPEN_MEMSTREAM
+#if defined(__APPLE__)
/*
* Implementation of the POSIX open_memstream() function, which Linux has
@@ -378,4 +378,4 @@ DONE
#endif
-#endif /*!HAVE_OPEN_MEMSTREAM*/
+#endif /* __APPLE__ */