diff options
| -rw-r--r-- | libs/binder/include/binder/Parcel.h | 2 | ||||
| -rw-r--r-- | libs/binder/include/private/binder/binder_module.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h index a123b255e5..819df92a0e 100644 --- a/libs/binder/include/binder/Parcel.h +++ b/libs/binder/include/binder/Parcel.h @@ -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; diff --git a/libs/binder/include/private/binder/binder_module.h b/libs/binder/include/private/binder/binder_module.h index 0fe7f5b088..5a719b8930 100644 --- a/libs/binder/include/private/binder/binder_module.h +++ b/libs/binder/include/private/binder/binder_module.h @@ -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 |