Merge "Fix the MacOS build of incremental*" am: f10099d79a am: 1714e21a8f
Change-Id: Ie67e0b2c1a71c68359f620be57aa8ec7a8d422ca
diff --git a/adb/client/incremental.cpp b/adb/client/incremental.cpp
index b728a6b..6499d46 100644
--- a/adb/client/incremental.cpp
+++ b/adb/client/incremental.cpp
@@ -16,6 +16,7 @@
#include "incremental.h"
+#include <android-base/endian.h>
#include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <openssl/base64.h>
@@ -26,12 +27,6 @@
#include "commandline.h"
#include "sysdeps.h"
-#ifndef _WIN32
-#include <endian.h>
-#else
-#define be32toh(x) _byteswap_ulong(x)
-#endif
-
using namespace std::literals;
namespace incremental {
diff --git a/adb/client/incremental_server.cpp b/adb/client/incremental_server.cpp
index d9fd77a..9037672 100644
--- a/adb/client/incremental_server.cpp
+++ b/adb/client/incremental_server.cpp
@@ -25,17 +25,7 @@
#include "adb_utils.h"
#include "sysdeps.h"
-#ifndef _WIN32
-#include <endian.h>
-#else
-#define be64toh(x) _byteswap_uint64(x)
-#define be32toh(x) _byteswap_ulong(x)
-#define be16toh(x) _byteswap_ushort(x)
-#define htobe64(x) _byteswap_uint64(x)
-#define htobe32(x) _byteswap_ulong(x)
-#define htobe16(x) _byteswap_ushort(x)
-#endif
-
+#include <android-base/endian.h>
#include <android-base/strings.h>
#include <lz4.h>
#include <stdio.h>