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

Commit 548d2210 authored Jan 16, 2019 by Tom Cherry Committed by android-build-merger Jan 16, 2019

Merge "Use #pragma one for all liblog includes"

am: 4f824612

Change-Id: I4b92941a25b79466d936e459843dee5f27360243

parents f62ad03c 4f824612

liblog/config_read.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		* limitations under the License.
		*/

		#ifndef _LIBLOG_CONFIG_READ_H__
		#define _LIBLOG_CONFIG_READ_H__
		#pragma once

		#include <cutils/list.h>

		@@ -51,5 +50,3 @@ LIBLOG_HIDDEN void __android_log_config_read();
		LIBLOG_HIDDEN void __android_log_config_read_close();

		__END_DECLS

		#endif /* _LIBLOG_CONFIG_READ_H__ */

liblog/config_write.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		* limitations under the License.
		*/

		#ifndef _LIBLOG_CONFIG_WRITE_H__
		#define _LIBLOG_CONFIG_WRITE_H__
		#pragma once

		#include <cutils/list.h>

		@@ -51,5 +50,3 @@ LIBLOG_HIDDEN void __android_log_config_write();
		LIBLOG_HIDDEN void __android_log_config_write_close();

		__END_DECLS

		#endif /* _LIBLOG_CONFIG_WRITE_H__ */

liblog/fake_log_device.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		* limitations under the License.
		*/

		#ifndef _LIBLOG_FAKE_LOG_DEVICE_H
		#define _LIBLOG_FAKE_LOG_DEVICE_H
		#pragma once

		#include <sys/types.h>

		@@ -36,5 +35,3 @@ LIBLOG_ABI_PUBLIC int __android_log_is_loggable_len(int prio, const char*, size_
		LIBLOG_ABI_PRIVATE int __android_log_is_debuggable();

		__END_DECLS

		#endif // _LIBLOG_FAKE_LOG_DEVICE_H

liblog/include/log/event_tag_map.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		* limitations under the License.
		*/

		#ifndef _LIBS_CUTILS_EVENTTAGMAP_H
		#define _LIBS_CUTILS_EVENTTAGMAP_H
		#pragma once

		#ifdef __cplusplus
		extern "C" {
		@@ -69,5 +68,3 @@ int android_lookupEventTagNum(EventTagMap* map, const char* tagname,
		#ifdef __cplusplus
		}
		#endif

		#endif /_LIBS_CUTILS_EVENTTAGMAP_H/

liblog/include/log/log.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,7 @@
		* limitations under the License.
		*/

		#ifndef _LIBS_LOG_LOG_H
		#define _LIBS_LOG_LOG_H
		#pragma once

		/* Too many in the ecosystem assume these are included */
		#if !defined(_WIN32)
		@@ -200,5 +199,3 @@ int __android_log_ratelimit(time_t seconds, time_t* last);
		#ifdef __cplusplus
		}
		#endif

		#endif /* _LIBS_LOG_LOG_H */