am 1a2bdd6f: Merge "liblog: fix fd leakage" (e657e0c2) · Commits · e / os / android_system_core

liblog/logd_write.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,8 @@
	#include <string.h>		#include <string.h>
	#include <stdlib.h>		#include <stdlib.h>
	#include <stdarg.h>		#include <stdarg.h>
			#include <sys/types.h>
			#include <sys/stat.h>

	#include <cutils/logger.h>		#include <cutils/logger.h>
	#include <cutils/logd.h>		#include <cutils/logd.h>
	@@ -37,7 +39,7 @@
	#define log_writev(filedes, vector, count) fakeLogWritev(filedes, vector, count)		#define log_writev(filedes, vector, count) fakeLogWritev(filedes, vector, count)
	#define log_close(filedes) fakeLogClose(filedes)		#define log_close(filedes) fakeLogClose(filedes)
	#else		#else
	#define log_open(pathname, flags) open(pathname, flags)		#define log_open(pathname, flags) open(pathname, (flags) \| O_CLOEXEC)
	#define log_writev(filedes, vector, count) writev(filedes, vector, count)		#define log_writev(filedes, vector, count) writev(filedes, vector, count)
	#define log_close(filedes) close(filedes)		#define log_close(filedes) close(filedes)
	#endif		#endif