Merge "libbinder: move kernel includes out of namespace" (5bc4bc41) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/binder/include/binder/Parcel.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,13 +38,13 @@ typedef unsigned int binder_size_t;
		typedef unsigned long long binder_size_t;
		#endif

		struct flat_binder_object;

		// ---------------------------------------------------------------------------
		namespace android {

		template <typename T> class Flattenable;
		template <typename T> class LightFlattenable;
		struct flat_binder_object;
		class IBinder;
		class IPCThreadState;
		class ProcessState;

+4 −4

Original line number	Diff line number	Diff line
		@@ -17,10 +17,6 @@
		#ifndef _BINDER_MODULE_H_
		#define _BINDER_MODULE_H_

		#ifdef __cplusplus
		namespace android {
		#endif

		/* obtain structures and constants from the kernel header */

		// TODO(b/31559095): bionic on host
		@@ -36,6 +32,10 @@ namespace android {
		#include <sys/ioctl.h>
		#include <linux/android/binder.h>

		#ifdef __cplusplus
		namespace android {
		#endif

		#ifndef BR_FROZEN_REPLY
		// Temporary definition of BR_FROZEN_REPLY. For production
		// this will come from UAPI binder.h