X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Finteger.c;h=5b56227d85d4d0ccfbd323aa52d3804c31d3682b;hp=719823b9ff23675aab3a0f1b787ddeb8f0af25f2;hb=9b0422a038d313a812e1c862122ec1f2b70add9a;hpb=64fa3fec6c28f1d077812b4bfa06ae73b0f5999d

diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c
index 719823b9..5b56227d 100644
--- a/formats/ctf/types/integer.c
+++ b/formats/ctf/types/integer.c
@@ -22,7 +22,7 @@
 #include <babeltrace/bitfield.h>
 #include <stdint.h>
 #include <glib.h>
-#include <endian.h>
+#include <babeltrace/endian.h>
 
 /*
  * The aligned read/write functions are expected to be faster than the
@@ -103,7 +103,7 @@ int _aligned_integer_read(struct stream_pos *ppos,
 
 			v = *(const int16_t *) ctf_get_pos_addr(pos);
 			integer_definition->value._signed =
-				rbo ? GUINT16_SWAP_LE_BE(v) : v;
+				rbo ? (int16_t) GUINT16_SWAP_LE_BE(v) : v;
 			break;
 		}
 		case 32:
@@ -112,7 +112,7 @@ int _aligned_integer_read(struct stream_pos *ppos,
 
 			v = *(const int32_t *) ctf_get_pos_addr(pos);
 			integer_definition->value._signed =
-				rbo ? GUINT32_SWAP_LE_BE(v) : v;
+				rbo ? (int32_t) GUINT32_SWAP_LE_BE(v) : v;
 			break;
 		}
 		case 64:
@@ -121,7 +121,7 @@ int _aligned_integer_read(struct stream_pos *ppos,
 
 			v = *(const int64_t *) ctf_get_pos_addr(pos);
 			integer_definition->value._signed =
-				rbo ? GUINT64_SWAP_LE_BE(v) : v;
+				rbo ? (int64_t) GUINT64_SWAP_LE_BE(v) : v;
 			break;
 		}
 		default:
@@ -182,12 +182,12 @@ int _aligned_integer_write(struct stream_pos *ppos,
 			break;
 		case 16:
 			*(int16_t *) ctf_get_pos_addr(pos) = rbo ?
-						 GUINT16_SWAP_LE_BE((int16_t) v) :
+						 (int16_t) GUINT16_SWAP_LE_BE((int16_t) v) :
 						 (int16_t) v;
 			break;
 		case 32:
 			*(int32_t *) ctf_get_pos_addr(pos) = rbo ?
-						 GUINT32_SWAP_LE_BE((int32_t) v) :
+						 (int32_t) GUINT32_SWAP_LE_BE((int32_t) v) :
 						 (int32_t) v;
 			break;
 		case 64: