openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp

This commit is contained in:
Isaac Katzenelson 2014-08-21 03:29:59 +00:00 committed by Android Git Automerger
parent 422bffb240 176fe9005d
commit 2145a6137e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/cutils/open_memstream.h
View File

@ -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__*/

4
libcutils/open_memstream.c
View File

@ -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__ */