diff options
| author | Lev Rumyantsev <levarum@google.com> | 2024-03-29 00:11:55 +0000 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2024-03-29 00:11:55 +0000 |
| commit | fc2da4b59f878b479dcc17fdc32c4d290df66cfa (patch) | |
| tree | 36650e76df49f31ed37dee1ae32b2033e5902a3f | |
| parent | 98e669d6815c1fdb5ffe908282a554ceb6672df5 (diff) | |
| download | native_bridge_support-fc2da4b59f878b479dcc17fdc32c4d290df66cfa.tar.gz | |
28-03-24: Upstream native_bridge_support
Test: tree-hugger
Bug: 232598137
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:62f365f5f4a640b798fad2cda28c887e28696b7c)
Merged-In: I212aa0243a7b47ef219b6d26658c8268a058ea9b
Change-Id: I212aa0243a7b47ef219b6d26658c8268a058ea9b
| -rw-r--r-- | guest_state/include/native_bridge_support/arm/guest_state/guest_state_cpu_state.h | 5 | ||||
| -rw-r--r-- | guest_state/include/native_bridge_support/arm64/guest_state/guest_state_cpu_state.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/guest_state/include/native_bridge_support/arm/guest_state/guest_state_cpu_state.h b/guest_state/include/native_bridge_support/arm/guest_state/guest_state_cpu_state.h index e96660a..cd2a549 100644 --- a/guest_state/include/native_bridge_support/arm/guest_state/guest_state_cpu_state.h +++ b/guest_state/include/native_bridge_support/arm/guest_state/guest_state_cpu_state.h @@ -17,6 +17,9 @@ #ifndef NATIVE_BRIDGE_SUPPORT_ARM_GUEST_STATE_GUEST_STATE_CPU_STATE_H_ #define NATIVE_BRIDGE_SUPPORT_ARM_GUEST_STATE_GUEST_STATE_CPU_STATE_H_ +#include <climits> +#include <cstdint> + namespace berberis { using GuestAddr = uintptr_t; @@ -59,4 +62,4 @@ struct CPUState { }; } -#endif // NATIVE_BRIDGE_SUPPORT_ARM_GUEST_STATE_GUEST_STATE_CPU_STATE_H_
\ No newline at end of file +#endif // NATIVE_BRIDGE_SUPPORT_ARM_GUEST_STATE_GUEST_STATE_CPU_STATE_H_ diff --git a/guest_state/include/native_bridge_support/arm64/guest_state/guest_state_cpu_state.h b/guest_state/include/native_bridge_support/arm64/guest_state/guest_state_cpu_state.h index 2ac723b..83d06dd 100644 --- a/guest_state/include/native_bridge_support/arm64/guest_state/guest_state_cpu_state.h +++ b/guest_state/include/native_bridge_support/arm64/guest_state/guest_state_cpu_state.h @@ -17,6 +17,8 @@ #ifndef NATIVE_BRIDGE_SUPPORT_ARM64_GUEST_STATE_GUEST_STATE_CPU_STATE_H_ #define NATIVE_BRIDGE_SUPPORT_ARM64_GUEST_STATE_GUEST_STATE_CPU_STATE_H_ +#include <cstdint> + namespace berberis { using GuestAddr = uintptr_t; @@ -60,4 +62,4 @@ struct CPUState { }; } -#endif // NATIVE_BRIDGE_SUPPORT_BRIDGE_SUPPORT_ARM64_GUEST_STATE_GUEST_STATE_CPU_STATE_H_
\ No newline at end of file +#endif // NATIVE_BRIDGE_SUPPORT_BRIDGE_SUPPORT_ARM64_GUEST_STATE_GUEST_STATE_CPU_STATE_H_ |