Endian wrapper use fix

[babeltrace.git] / include / babeltrace / bitfield.h

diff --git a/include/babeltrace/bitfield.h b/include/babeltrace/bitfield.h
index 84a9679003e32de0d8fc29b3591fab230fb07bba..d14d562db55e2534f7fb1b415049571a87242737 100644 (file)
--- a/include/babeltrace/bitfield.h
+++ b/include/babeltrace/bitfield.h
@@ -21,8 +21,8 @@
 
 #include <stdint.h>    /* C99 5.2.4.2 Numerical limits */
 #include <limits.h>    /* C99 5.2.4.2 Numerical limits */
-#include <endian.h>    /* Non-standard BIG_ENDIAN, LITTLE_ENDIAN, BYTE_ORDER */
 #include <assert.h>
+#include <babeltrace/endian.h> /* Non-standard BIG_ENDIAN, LITTLE_ENDIAN, BYTE_ORDER */
 
 /* We can't shift a int from 32 bit, >> 32 and << 32 on int is undefined */
 #define _bt_piecewise_rshift(_v, _shift)                               \
@@ -79,7 +79,7 @@
 #define _bt_bitfield_write_le(_ptr, type, _start, _length, _v)         \
 do {                                                                   \
        typeof(_v) __v = (_v);                                          \
-       typeof(*(_ptr)) *__ptr = (_ptr);                                \
+       type *__ptr = (void *) (_ptr);                                  \
        unsigned long __start = (_start), __length = (_length);         \
        type mask, cmask;                                               \
        unsigned long ts = sizeof(type) * CHAR_BIT; /* type size */     \
@@ -138,7 +138,7 @@ do {                                                                        \
 #define _bt_bitfield_write_be(_ptr, type, _start, _length, _v)         \
 do {                                                                   \
        typeof(_v) __v = (_v);                                          \
-       typeof(*(_ptr)) *__ptr = (_ptr);                                \
+       type *__ptr = (void *) (_ptr);                                  \
        unsigned long __start = (_start), __length = (_length);         \
        type mask, cmask;                                               \
        unsigned long ts = sizeof(type) * CHAR_BIT; /* type size */     \
@@ -231,8 +231,8 @@ do {                                                                        \
 #define _bt_bitfield_read_le(_ptr, type, _start, _length, _vptr)       \
 do {                                                                   \
        typeof(*(_vptr)) *__vptr = (_vptr);                             \
-       typeof(*(_ptr)) *__ptr = (_ptr);                                \
        typeof(*__vptr) __v;                                            \
+       type *__ptr = (void *) (_ptr);                                  \
        unsigned long __start = (_start), __length = (_length);         \
        type mask, cmask;                                               \
        unsigned long ts = sizeof(type) * CHAR_BIT; /* type size */     \
@@ -298,8 +298,8 @@ do {                                                                        \
 #define _bt_bitfield_read_be(_ptr, type, _start, _length, _vptr)       \
 do {                                                                   \
        typeof(*(_vptr)) *__vptr = (_vptr);                             \
-       typeof(*(_ptr)) *__ptr = (_ptr);                                \
        typeof(*__vptr) __v;                                            \
+       type *__ptr = (void *) (_ptr);                                  \
        unsigned long __start = (_start), __length = (_length);         \
        type mask, cmask;                                               \
        unsigned long ts = sizeof(type) * CHAR_BIT; /* type size */     \