From b5f738abf34866b563e5c7df433d88daa62d2fa6 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 3 May 2017 13:25:10 +0200
Subject: [PATCH] Move xxx_le26 from miniacc.h to bele.h.

---
 src/bele.h    | 18 ++++++++----------
 src/miniacc.h | 16 ----------------
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/bele.h b/src/bele.h
index a5752810..4f1d0446 100644
--- a/src/bele.h
+++ b/src/bele.h
@@ -144,20 +144,18 @@ inline void set_le24(void *p, unsigned v)
 
 inline unsigned get_le26(const void *p)
 {
-#if defined(ACC_UA_GET_LE26)
-    return ACC_UA_GET_LE26(p);
-#else
-    return acc_ua_get_le26(p);
-#endif
+    const acc_hbyte_p b = ACC_CCAST(const acc_hbyte_p, p);
+    return ACC_ICONV(acc_uint32l_t, b[0]       ) | (  ACC_ICONV(acc_uint32l_t, b[1])     <<  8) |
+          (ACC_ICONV(acc_uint32l_t, b[2]) << 16) | (((ACC_ICONV(acc_uint32l_t, b[3]) & 3)<< 24));
 }
 
 inline void set_le26(void *p, unsigned v)
 {
-#if defined(ACC_UA_SET_LE26)
-    ACC_UA_SET_LE26(p, v);
-#else
-    acc_ua_set_le26(p, v);
-#endif
+    acc_hbyte_p b = ACC_PCAST(acc_hbyte_p, p);
+    b[0] = ACC_ICONV(unsigned char, (v >>  0) & 0xff);
+    b[1] = ACC_ICONV(unsigned char, (v >>  8) & 0xff);
+    b[2] = ACC_ICONV(unsigned char, (v >> 16) & 0xff);
+    b[3] = ACC_ICONV(unsigned char, (v >> 24) & 0x03) | (0xFC & b[3]);
 }
 
 inline unsigned get_le32(const void *p)
diff --git a/src/miniacc.h b/src/miniacc.h
index fc6f29c2..de8cb47f 100644
--- a/src/miniacc.h
+++ b/src/miniacc.h
@@ -5103,11 +5103,9 @@ ACCLIB_EXTERN(void, acc_ua_set_be24) (acc_hvoid_p, acc_uint32l_t);
 ACCLIB_EXTERN(void, acc_ua_set_be32) (acc_hvoid_p, acc_uint32l_t);
 ACCLIB_EXTERN(unsigned, acc_ua_get_le16) (const acc_hvoid_p);
 ACCLIB_EXTERN(acc_uint32l_t, acc_ua_get_le24) (const acc_hvoid_p);
-ACCLIB_EXTERN(acc_uint32l_t, acc_ua_get_le26) (const acc_hvoid_p);
 ACCLIB_EXTERN(acc_uint32l_t, acc_ua_get_le32) (const acc_hvoid_p);
 ACCLIB_EXTERN(void, acc_ua_set_le16) (acc_hvoid_p, unsigned);
 ACCLIB_EXTERN(void, acc_ua_set_le24) (acc_hvoid_p, acc_uint32l_t);
-ACCLIB_EXTERN(void, acc_ua_set_le26) (acc_hvoid_p, acc_uint32l_t);
 ACCLIB_EXTERN(void, acc_ua_set_le32) (acc_hvoid_p, acc_uint32l_t);
 #if defined(acc_int64l_t)
 ACCLIB_EXTERN(acc_uint64l_t, acc_ua_get_be64) (const acc_hvoid_p);
@@ -6097,12 +6095,6 @@ ACCLIB_PUBLIC(acc_uint32l_t, acc_ua_get_le24) (const acc_hvoid_p p)
     const acc_hbyte_p b = ACC_CCAST(const acc_hbyte_p, p);
     return ACC_ICONV(acc_uint32l_t, b[0]) | (ACC_ICONV(acc_uint32l_t, b[1]) << 8) | (ACC_ICONV(acc_uint32l_t, b[2]) << 16);
 }
-ACCLIB_PUBLIC(acc_uint32l_t, acc_ua_get_le26) (const acc_hvoid_p p)
-{
-    const acc_hbyte_p b = ACC_CCAST(const acc_hbyte_p, p);
-    return ACC_ICONV(acc_uint32l_t, b[0]       ) | (  ACC_ICONV(acc_uint32l_t, b[1])     <<  8) |
-          (ACC_ICONV(acc_uint32l_t, b[2]) << 16) | (((ACC_ICONV(acc_uint32l_t, b[3]) & 3)<< 24));
-}
 ACCLIB_PUBLIC(acc_uint32l_t, acc_ua_get_le32) (const acc_hvoid_p p)
 {
 #if defined(ACC_UA_GET_LE32)
@@ -6129,14 +6121,6 @@ ACCLIB_PUBLIC(void, acc_ua_set_le24) (acc_hvoid_p p, acc_uint32l_t v)
     b[1] = ACC_ICONV(unsigned char, (v >>  8) & 0xff);
     b[2] = ACC_ICONV(unsigned char, (v >> 16) & 0xff);
 }
-ACCLIB_PUBLIC(void, acc_ua_set_le26) (acc_hvoid_p p, acc_uint32l_t v)
-{
-    acc_hbyte_p b = ACC_PCAST(acc_hbyte_p, p);
-    b[0] = ACC_ICONV(unsigned char, (v >>  0) & 0xff);
-    b[1] = ACC_ICONV(unsigned char, (v >>  8) & 0xff);
-    b[2] = ACC_ICONV(unsigned char, (v >> 16) & 0xff);
-    b[3] = ACC_ICONV(unsigned char, (v >> 24) & 0x03) | (0xFC & b[3]);
-}
 ACCLIB_PUBLIC(void, acc_ua_set_le32) (acc_hvoid_p p, acc_uint32l_t v)
 {
 #if defined(ACC_UA_SET_LE32)