am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."

* commit 'a59b6ac6973b3f5ce1246bf73969094779436892':
  Only the Mac doesn't have open_memstream.
This commit is contained in:
Elliott Hughes 2014-08-21 02:58:30 +00:00 committed by Android Git Automerger
commit 4592d73e18
2 changed files with 4 additions and 4 deletions

View file

@ -19,7 +19,7 @@
#include <stdio.h> #include <stdio.h>
#ifndef HAVE_OPEN_MEMSTREAM #if defined(__APPLE__)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -31,6 +31,6 @@ FILE* open_memstream(char** bufp, size_t* sizep);
} }
#endif #endif
#endif /*!HAVE_OPEN_MEMSTREAM*/ #endif /* __APPLE__ */
#endif /*__CUTILS_OPEN_MEMSTREAM_H__*/ #endif /*__CUTILS_OPEN_MEMSTREAM_H__*/

View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef HAVE_OPEN_MEMSTREAM #if defined(__APPLE__)
/* /*
* Implementation of the POSIX open_memstream() function, which Linux has * Implementation of the POSIX open_memstream() function, which Linux has
@ -378,4 +378,4 @@ DONE
#endif #endif
#endif /*!HAVE_OPEN_MEMSTREAM*/ #endif /* __APPLE__ */