fixup! interpreter: add macos compat for htole32 and htole64

Author: delta1

src/script/interpreter.cpp

@@ -16,12 +16,6 @@ extern "C" {
 #include <simplicity/elements/exec.h>
 #include <simplicity/errorCodes.h>
 }
-// ELEMENTS: Macos compat for htole32 and htole64
-#if defined(__APPLE__)
-  #include <libkern/OSByteOrder.h>
-  #define htole32(x) OSSwapHostToLittleInt32(x)
-  #define htole64(x) OSSwapHostToLittleInt64(x)
-#endif
 
 typedef std::vector<unsigned char> valtype;
 
@@ -90,13 +84,13 @@ static inline int64_t read_le8_signed(const unsigned char* ptr)
 
 static inline void push4_le(std::vector<valtype>& stack, uint32_t v)
 {
-    uint32_t v_le = htole32(v);
+    uint32_t v_le = htole32_internal(v);
     stack.emplace_back(reinterpret_cast<unsigned char*>(&v_le), reinterpret_cast<unsigned char*>(&v_le) + sizeof(v_le));
 }
 
 static inline void push8_le(std::vector<valtype>& stack, uint64_t v)
 {
-    uint64_t v_le = htole64(v);
+    uint64_t v_le = htole64_internal(v);
     stack.emplace_back(reinterpret_cast<unsigned char*>(&v_le), reinterpret_cast<unsigned char*>(&v_le) + sizeof(v_le));
 }
 
@@ -1669,7 +1663,7 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
                     hasher.Write(vchSeed.data(), vchSeed.size());
                     do {
                         if (nHashIndex >= 3) {
-                            uint64_t le_counter = htole64(nCounter);
+                            uint64_t le_counter = htole64_internal(nCounter);
                             CSHA256(hasher).Write((const unsigned char*)&le_counter, sizeof(nCounter)).Finalize(vchHash.data());
                             nHashIndex = 0;
                             nCounter++;

src/test/fuzz/simplicity.cpp

@@ -69,7 +69,7 @@ uint32_t read_u32(const unsigned char **buf) {
     uint32_t ret;
     memcpy(&ret, *buf, 4);
     *buf += 4;
-    return le32toh(ret);
+    return le32toh_internal(ret);
 }
 
 #define MAX_LEN (1024 * 1024)