From 2f8de227dc7d2525320a7be06efbab0376144dc4 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Thu, 18 Jan 2024 22:09:09 +0100 Subject: [PATCH] Remove: unused OTTD_ALIGNMENT define and ReadLE16(Un)aligned --- src/core/endian_func.hpp | 14 -------------- src/core/endian_type.hpp | 8 -------- 2 files changed, 22 deletions(-) diff --git a/src/core/endian_func.hpp b/src/core/endian_func.hpp index 1c8b8083da5..b6cdebda16d 100644 --- a/src/core/endian_func.hpp +++ b/src/core/endian_func.hpp @@ -38,18 +38,4 @@ # define TO_LE32X(x) (x) #endif /* TTD_ENDIAN == TTD_BIG_ENDIAN */ -inline uint16_t ReadLE16Aligned(const void *x) -{ - return FROM_LE16(*(const uint16_t*)x); -} - -inline uint16_t ReadLE16Unaligned(const void *x) -{ -#if OTTD_ALIGNMENT == 1 - return ((const byte*)x)[0] | ((const byte*)x)[1] << 8; -#else - return FROM_LE16(*(const uint16_t*)x); -#endif /* OTTD_ALIGNMENT == 1 */ -} - #endif /* ENDIAN_FUNC_HPP */ diff --git a/src/core/endian_type.hpp b/src/core/endian_type.hpp index f7cae53a8fa..025bae89876 100644 --- a/src/core/endian_type.hpp +++ b/src/core/endian_type.hpp @@ -10,14 +10,6 @@ #ifndef ENDIAN_TYPE_HPP #define ENDIAN_TYPE_HPP -#if defined(ARM) || defined(__arm__) || defined(__alpha__) - /** The architecture requires aligned access. */ -# define OTTD_ALIGNMENT 1 -#else - /** The architecture does not require aligned access. */ -# define OTTD_ALIGNMENT 0 -#endif - /** Little endian builds use this for TTD_ENDIAN. */ #define TTD_LITTLE_ENDIAN 0 /** Big endian builds use this for TTD_ENDIAN. */