Merge "Fix the MacOS build of incremental*" am: f10099d79a am: 1714e21a8f (42ef4e2f) · Commits · e / os / android_system_core

adb/client/incremental.cpp

+1 −6

Original line number	Diff line number	Diff line
		@@ -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 {

+1 −11

Original line number	Diff line number	Diff line
		@@ -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>