Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2145a613 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android Git Automerger
Browse files

Merge branch 'lmp-dev-plus-aosp' of... 

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

include/cutils/open_memstream.h

+2 −2
Original line number Diff line number Diff line
@@ -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__*/

libcutils/open_memstream.c

+2 −2
Original line number Diff line number Diff line
@@ -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__ */