include/osl/endian.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
New commits: commit b459f073d79a6e1757bb83325247cff3d13b8e3b Author: Mike Kaganski <[email protected]> AuthorDate: Wed Oct 29 14:51:53 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Wed Oct 29 12:45:25 2025 +0100 Simplify OSL_NET(D)WORD using OSL_SWAP(D)WORD Change-Id: Ib558e43a8ef44eba4cd82adc75938d67bb4d3e0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193138 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/include/osl/endian.h b/include/osl/endian.h index dd2786186e78..8dd5387c0b84 100644 --- a/include/osl/endian.h +++ b/include/osl/endian.h @@ -110,6 +110,16 @@ extern "C" { #endif +/** Define macros for swapping between byte orders. + */ +#ifndef OSL_SWAPWORD +# define OSL_SWAPWORD(w) OSL_MAKEWORD(OSL_HIBYTE(w),OSL_LOBYTE(w)) +#endif +#ifndef OSL_SWAPDWORD +# define OSL_SWAPDWORD(d) OSL_MAKEDWORD(OSL_SWAPWORD(OSL_HIWORD(d)),OSL_SWAPWORD(OSL_LOWORD(d))) +#endif + + /** Define macros for swapping between host and network byte order. */ #ifdef OSL_BIGENDIAN @@ -121,24 +131,14 @@ extern "C" { #endif #else /* OSL_LITENDIAN */ #ifndef OSL_NETWORD -# define OSL_NETWORD(w) OSL_MAKEWORD(OSL_HIBYTE(w),OSL_LOBYTE(w)) +# define OSL_NETWORD(w) OSL_SWAPWORD(w) #endif #ifndef OSL_NETDWORD -# define OSL_NETDWORD(d) OSL_MAKEDWORD(OSL_NETWORD(OSL_HIWORD(d)),OSL_NETWORD(OSL_LOWORD(d))) +# define OSL_NETDWORD(d) OSL_SWAPDWORD(d) #endif #endif /* OSL_BIGENDIAN */ -/** Define macros for swapping between byte orders. - */ -#ifndef OSL_SWAPWORD -# define OSL_SWAPWORD(w) OSL_MAKEWORD(OSL_HIBYTE(w),OSL_LOBYTE(w)) -#endif -#ifndef OSL_SWAPDWORD -# define OSL_SWAPDWORD(d) OSL_MAKEDWORD(OSL_SWAPWORD(OSL_HIWORD(d)),OSL_SWAPWORD(OSL_LOWORD(d))) -#endif - - #ifdef __cplusplus } #endif
