summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-08-21 03:16:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-21 03:16:26 +0000
commit176fe9005df41c84c0145f4779222e3b00f3e40f (patch)
treecbc858f15fcb4f5e57bc4e387be5da5703ea3996 /include
parent3601abb810e7e33902e461ed0386673d3be11af9 (diff)
parent4592d73e18684b8ba2addb97433eed4cf389e386 (diff)
downloadsystem_core-176fe9005df41c84c0145f4779222e3b00f3e40f.zip
system_core-176fe9005df41c84c0145f4779222e3b00f3e40f.tar.gz
system_core-176fe9005df41c84c0145f4779222e3b00f3e40f.tar.bz2
am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
* commit '4592d73e18684b8ba2addb97433eed4cf389e386': Only the Mac doesn't have open_memstream.
Diffstat (limited to 'include')
-rw-r--r--include/cutils/open_memstream.h4
1 files changed, 2 insertions, 2 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__*/