From 575f24f5df72db92e2c7cab7df2a5409eeb7c18b Mon Sep 17 00:00:00 2001
From: Christian Blichmann <cblichmann@google.com>
Date: Wed, 30 Sep 2020 04:12:25 -0700
Subject: [PATCH] Internal change

PiperOrigin-RevId: 334569306
Change-Id: Ibf1b3a24b57b02ce1c5e6106e5331520dfdf7112
---
 sandboxed_api/sandbox2/buffer.cc     | 2 +-
 sandboxed_api/sandbox2/buffer.h      | 2 +-
 sandboxed_api/sandbox2/comms.h       | 8 ++++----
 sandboxed_api/sandbox2/comms_test.cc | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sandboxed_api/sandbox2/buffer.cc b/sandboxed_api/sandbox2/buffer.cc
index 074618d..c494061 100644
--- a/sandboxed_api/sandbox2/buffer.cc
+++ b/sandboxed_api/sandbox2/buffer.cc
@@ -54,7 +54,7 @@ absl::StatusOr<std::unique_ptr<Buffer>> Buffer::CreateFromFd(int fd) {
 
 // Creates a new Buffer of the specified size, backed by a temporary file that
 // will be immediately deleted.
-absl::StatusOr<std::unique_ptr<Buffer>> Buffer::CreateWithSize(int64_t size) {
+absl::StatusOr<std::unique_ptr<Buffer>> Buffer::CreateWithSize(int64 size) {
   int fd;
   if (!util::CreateMemFd(&fd)) {
     return absl::InternalError("Could not create buffer temp file");
diff --git a/sandboxed_api/sandbox2/buffer.h b/sandboxed_api/sandbox2/buffer.h
index d613bcd..d6024b5 100644
--- a/sandboxed_api/sandbox2/buffer.h
+++ b/sandboxed_api/sandbox2/buffer.h
@@ -41,7 +41,7 @@ class Buffer final {
 
   // Creates a new Buffer of the specified size, backed by a temporary file that
   // will be immediately deleted.
-  static absl::StatusOr<std::unique_ptr<Buffer>> CreateWithSize(int64_t size);
+  static absl::StatusOr<std::unique_ptr<Buffer>> CreateWithSize(int64 size);
 
   // Returns a pointer to the buffer, which is read/write.
   uint8_t* data() const { return buf_; }
diff --git a/sandboxed_api/sandbox2/comms.h b/sandboxed_api/sandbox2/comms.h
index fca8c53..c3fac21 100644
--- a/sandboxed_api/sandbox2/comms.h
+++ b/sandboxed_api/sandbox2/comms.h
@@ -128,10 +128,10 @@ class Comms {
   bool SendUint32(uint32_t v) { return SendGeneric(v, kTagUint32); }
   bool RecvInt32(int32_t* v) { return RecvIntGeneric(v, kTagInt32); }
   bool SendInt32(int32_t v) { return SendGeneric(v, kTagInt32); }
-  bool RecvUint64(uint64_t* v) { return RecvIntGeneric(v, kTagUint64); }
-  bool SendUint64(uint64_t v) { return SendGeneric(v, kTagUint64); }
-  bool RecvInt64(int64_t* v) { return RecvIntGeneric(v, kTagInt64); }
-  bool SendInt64(int64_t v) { return SendGeneric(v, kTagInt64); }
+  bool RecvUint64(uint64* v) { return RecvIntGeneric(v, kTagUint64); }
+  bool SendUint64(uint64 v) { return SendGeneric(v, kTagUint64); }
+  bool RecvInt64(int64* v) { return RecvIntGeneric(v, kTagInt64); }
+  bool SendInt64(int64 v) { return SendGeneric(v, kTagInt64); }
   bool RecvBool(bool* v) { return RecvIntGeneric(v, kTagBool); }
   bool SendBool(bool v) { return SendGeneric(v, kTagBool); }
   bool RecvString(std::string* v);
diff --git a/sandboxed_api/sandbox2/comms_test.cc b/sandboxed_api/sandbox2/comms_test.cc
index bb8eedd..496045e 100644
--- a/sandboxed_api/sandbox2/comms_test.cc
+++ b/sandboxed_api/sandbox2/comms_test.cc
@@ -174,13 +174,13 @@ TEST_F(CommsTest, TestSendRecv64) {
     ASSERT_THAT(comms->SendUint64(1099511627776ULL), IsTrue());
 
     // Recv Int64.
-    int64_t tmp64;
+    int64 tmp64;
     ASSERT_THAT(comms->RecvInt64(&tmp64), IsTrue());
     EXPECT_THAT(tmp64, Eq(-1099511627776LL));
   };
   auto b = [](Comms* comms) {
     // Recv Uint64.
-    uint64_t tmpu64;
+    uint64 tmpu64;
     ASSERT_THAT(comms->RecvUint64(&tmpu64), IsTrue());
     EXPECT_THAT(tmpu64, Eq(1099511627776ULL));