Date: Fri, 17 Jan 2025 21:47:43 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 26a36671be5b - main - net/ipsumdump: better bswap_32 fix Message-ID: <202501172147.50HLlhIi064312@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=26a36671be5b2a6b412835ca34e8b2c7b04e3193 commit 26a36671be5b2a6b412835ca34e8b2c7b04e3193 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2025-01-17 21:20:47 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2025-01-17 21:46:15 +0000 net/ipsumdump: better bswap_32 fix Just include byteswap.h, which defines bswap_32(). --- net/ipsumdump/files/patch-src_aggtree.cc | 11 +++++------ net/ipsumdump/files/patch-src_aggwtree.cc | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/net/ipsumdump/files/patch-src_aggtree.cc b/net/ipsumdump/files/patch-src_aggtree.cc index 23173ae98a0c..8b16683c92b7 100644 --- a/net/ipsumdump/files/patch-src_aggtree.cc +++ b/net/ipsumdump/files/patch-src_aggtree.cc @@ -1,14 +1,13 @@ --- src/aggtree.cc.orig 2014-05-02 12:23:53 UTC +++ src/aggtree.cc -@@ -11,9 +11,11 @@ +@@ -11,9 +11,7 @@ #ifdef HAVE_BYTEORDER_H #include <byteorder.h> #else -+#if !defined(__powerpc__) && !defined(POWERPC64) - static inline uint32_t bswap_32(uint32_t u) { - return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24)); - } -+#endif +-static inline uint32_t bswap_32(uint32_t u) { +- return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24)); +-} ++#include <byteswap.h> #endif diff --git a/net/ipsumdump/files/patch-src_aggwtree.cc b/net/ipsumdump/files/patch-src_aggwtree.cc index bea7755f858f..37513ac8817f 100644 --- a/net/ipsumdump/files/patch-src_aggwtree.cc +++ b/net/ipsumdump/files/patch-src_aggwtree.cc @@ -1,14 +1,13 @@ --- src/aggwtree.cc.orig 2014-05-02 12:23:53 UTC +++ src/aggwtree.cc -@@ -10,9 +10,11 @@ +@@ -10,9 +10,7 @@ #ifdef HAVE_BYTEORDER_H #include <byteorder.h> #else -+#if !defined(__powerpc__) && !defined(POWERPC64) - static inline uint32_t bswap_32(uint32_t u) { - return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24)); - } -+#endif +-static inline uint32_t bswap_32(uint32_t u) { +- return ((u >> 24) | ((u & 0xff0000) >> 8) | ((u & 0xff00) << 8) | ((u & 0xff) << 24)); +-} ++#include <byteswap.h> #endif typedef AggregateWTree::WNode WNode;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501172147.50HLlhIi064312>