Changeset 4274:c73655bf5888 in roaraudio

Timestamp:

08/28/10 15:53:14 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

updated macro to work with 64 bit types correctly

File:

• include/roaraudio/byteorder.h (modified) (2 diffs)

include/roaraudio/byteorder.h

@@ -30 +30 @@
 #define _ROARAUDIO_BYTEORDER_H_
 
-#define _ROAR_MOVE_BYTE(x,p,n) (((x) & (0xFFUL << (8*(p)))) >> (8*(p)) << ((n)-8*((p)+1)))
+#define _ROAR_MOVE_BYTE(x,p,n) ( \
+                                ((int_least64_t)( \
+                                 ((int_least64_t)((int_least64_t)(x) & ((int_least64_t)0xFFUL << (8*(p))))) >> (8*(p)) \
+                                )) << ((n)-8*((p)+1)) \
+                               )
 
 #if BYTE_ORDER == BIG_ENDIAN && !defined(ROAR_TARGET_WIN32)
@@ -58 +62 @@
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define ROAR_NET2HOST64(x) ROAR_HOST2NET64(x)
-#define ROAR_HOST2NET64(x) (_ROAR_MOVE_BYTE((x), 0, 64) | _ROAR_MOVE_BYTE((x), 1, 64) | \
-                            _ROAR_MOVE_BYTE((x), 2, 64) | _ROAR_MOVE_BYTE((x), 3, 64) | \
-                            _ROAR_MOVE_BYTE((x), 4, 64) | _ROAR_MOVE_BYTE((x), 5, 64) | \
-                            _ROAR_MOVE_BYTE((x), 6, 64) | _ROAR_MOVE_BYTE((x), 7, 64) )
+#define ROAR_HOST2NET64(x) ((int_least64_t) \
+                            (_ROAR_MOVE_BYTE((x), 0, 64) | _ROAR_MOVE_BYTE((x), 1, 64) | \
+                             _ROAR_MOVE_BYTE((x), 2, 64) | _ROAR_MOVE_BYTE((x), 3, 64) | \
+                             _ROAR_MOVE_BYTE((x), 4, 64) | _ROAR_MOVE_BYTE((x), 5, 64) | \
+                             _ROAR_MOVE_BYTE((x), 6, 64) | _ROAR_MOVE_BYTE((x), 7, 64) ) )
 #else
 /* PDP byte order */