jshn: read and write 64-bit integers

[project/libubox.git] / utils.h

diff --git a/utils.h b/utils.h
index 803150b..e72d947 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -57,7 +57,8 @@ extern int __BUILD_BUG_ON_CONDITION_FAILED;
 #define BUILD_BUG_ON __BUILD_BUG_ON
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(CLOCK_MONOTONIC)
+#define LIBUBOX_COMPAT_CLOCK_GETTIME
 
 #include <mach/clock_types.h>
 #define CLOCK_REALTIME CALENDAR_CLOCK
@@ -169,22 +170,6 @@ static inline uint16_t __u_bswap16(uint16_t val)
 #define __hidden __attribute__((visibility("hidden")))
 #endif
 
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG (8 * sizeof(unsigned long))
-#endif
-
-#define BITFIELD_SIZE(_n) (((_n) + (BITS_PER_LONG - 1)) / BITS_PER_LONG)
-
-static inline void bitfield_set(unsigned long *bits, int bit)
-{
-       bits[bit / BITS_PER_LONG] |= (1UL << (bit % BITS_PER_LONG));
-}
-
-static inline bool bitfield_test(unsigned long *bits, int bit)
-{
-       return !!(bits[bit / BITS_PER_LONG] & (1UL << (bit % BITS_PER_LONG)));
-}
-
 int b64_encode(const void *src, size_t src_len,
               void *dest, size_t dest_len);