libubox: drop legacy json-c support

[project/libubox.git] / utils.h

diff --git a/utils.h b/utils.h
index db6217e..9688a6a 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -100,7 +100,10 @@ void clock_gettime(int type, struct timespec *tv);
 #define __LITTLE_ENDIAN LITTLE_ENDIAN
 #endif
 
-#define __u_bswap16(x) ({ uint16_t val = (x); ((uint16_t)(((val >> 8) & 0xffu) | ((val & 0xffu) << 8))); })
+static inline uint16_t __u_bswap16(uint16_t val)
+{
+       return ((val >> 8) & 0xffu) | ((val & 0xffu) << 8);
+}
 
 #if _GNUC_MIN_VER(4, 2)
 #define __u_bswap32(x) __builtin_bswap32(x)
@@ -152,10 +155,20 @@ void clock_gettime(int type, struct timespec *tv);
 #define __packed __attribute__((packed))
 #endif
 
+#ifndef __constructor
+#define __constructor __attribute__((constructor))
+#endif
+
+#ifndef __hidden
+#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));