From owner-svn-ports-all@freebsd.org Tue Oct 29 18:21:53 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B4969160112; Tue, 29 Oct 2019 18:21:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 472g0K39k5z3PbN; Tue, 29 Oct 2019 18:21:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3966A25DDE; Tue, 29 Oct 2019 18:21:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9TILrE0043901; Tue, 29 Oct 2019 18:21:53 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9TILrWZ043900; Tue, 29 Oct 2019 18:21:53 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201910291821.x9TILrWZ043900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 29 Oct 2019 18:21:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516026 - head/devel/android-tools-fastboot/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/devel/android-tools-fastboot/files X-SVN-Commit-Revision: 516026 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Oct 2019 18:21:53 -0000 Author: jbeich Date: Tue Oct 29 18:21:52 2019 New Revision: 516026 URL: https://svnweb.freebsd.org/changeset/ports/516026 Log: devel/android-tools-fastboot: simplify fix Modified: head/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h (contents, props changed) Modified: head/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h ============================================================================== --- head/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h Tue Oct 29 18:20:31 2019 (r516025) +++ head/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h Tue Oct 29 18:21:52 2019 (r516026) @@ -1,58 +1,19 @@ --- base/include/android-base/endian.h.orig 2019-10-18 00:22:21 UTC +++ base/include/android-base/endian.h -@@ -50,6 +50,8 @@ - #if defined(__APPLE__) - /* macOS has some of the basics. */ - #include -+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include - #else - /* Windows has some of the basics as well. */ - #include -@@ -71,22 +73,39 @@ +@@ -25,10 +25,15 @@ - #define ntohq(x) __builtin_bswap64(x) + #include -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - #define htobe16(x) __builtin_bswap16(x) - #define htobe32(x) __builtin_bswap32(x) - #define htobe64(x) __builtin_bswap64(x) -+#endif +-#elif defined(__GLIBC__) ++#elif defined(__GLIBC__) || defined(__DragonFly__) || defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || defined(__OpenBSD__) -+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#define betoh16(x) be16toh(x) -+#define betoh32(x) be32toh(x) -+#define betoh64(x) be64toh(x) ++#if defined(__GLIBC__) + /* glibc's is like bionic's . */ + #include +#else - #define betoh16(x) __builtin_bswap16(x) - #define betoh32(x) __builtin_bswap32(x) - #define betoh64(x) __builtin_bswap64(x) ++#include +#endif -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - #define htole16(x) (x) - #define htole32(x) (x) - #define htole64(x) (x) -+#endif - -+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#define letoh16(x) le16toh(x) -+#define letoh32(x) le32toh(x) -+#define letoh64(x) le64toh(x) -+#else - #define letoh16(x) (x) - #define letoh32(x) (x) - #define letoh64(x) (x) -+#endif - -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - #define be16toh(x) __builtin_bswap16(x) - #define be32toh(x) __builtin_bswap32(x) - #define be64toh(x) __builtin_bswap64(x) -@@ -94,5 +113,6 @@ - #define le16toh(x) (x) - #define le32toh(x) (x) - #define le64toh(x) (x) -+#endif - - #endif + /* glibc keeps htons and htonl in . */ + #include