diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-10-29 18:21:52 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-10-29 18:21:52 +0000 |
| commit | 759875af9a94461f68513b981ffb5ee94c3e97b6 (patch) | |
| tree | a315f8a149e7598cba08cdddfb1bb224fef66cc4 /devel/android-tools-fastboot | |
| parent | net-mgmt/nagvis: update 1.9.15 to 1.9.16 (diff) | |
devel/android-tools-fastboot: simplify <sys/endian.h> fix
Notes
Notes:
svn path=/head/; revision=516026
Diffstat (limited to 'devel/android-tools-fastboot')
| -rw-r--r-- | devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h | 61 |
1 files changed, 11 insertions, 50 deletions
diff --git a/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h b/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h index 5e6e51b671a7..04bda9b2f8b0 100644 --- a/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h +++ b/devel/android-tools-fastboot/files/patch-base_include_android-base_endian.h @@ -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 <sys/_endian.h> -+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include <sys/endian.h> - #else - /* Windows has some of the basics as well. */ - #include <sys/param.h> -@@ -71,22 +73,39 @@ - - #define ntohq(x) __builtin_bswap64(x) +@@ -25,10 +25,15 @@ -+#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 - -+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#define betoh16(x) be16toh(x) -+#define betoh32(x) be32toh(x) -+#define betoh64(x) be64toh(x) -+#else - #define betoh16(x) __builtin_bswap16(x) - #define betoh32(x) __builtin_bswap32(x) - #define betoh64(x) __builtin_bswap64(x) -+#endif + #include <sys/endian.h> -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) - #define htole16(x) (x) - #define htole32(x) (x) - #define htole64(x) (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 letoh16(x) le16toh(x) -+#define letoh32(x) le32toh(x) -+#define letoh64(x) le64toh(x) ++#if defined(__GLIBC__) + /* glibc's <endian.h> is like bionic's <sys/endian.h>. */ + #include <endian.h> +#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) ++#include <sys/endian.h> +#endif - #endif + /* glibc keeps htons and htonl in <netinet/in.h>. */ + #include <netinet/in.h> |