X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-writer%2Fserialize-internal.h;h=6471993c23a5c739c5e3e1b87c1446fb46c354d3;hb=c55a9f585da53ea54ac458155fac3cdec1779d47;hp=15ced8debe823b0f048b2cf93ff3284eb3e0a098;hpb=3d9990ac8bcbb870300869ed217b80151b52bf4e;p=babeltrace.git

diff --git a/include/babeltrace/ctf-writer/serialize-internal.h b/include/babeltrace/ctf-writer/serialize-internal.h
index 15ced8de..6471993c 100644
--- a/include/babeltrace/ctf-writer/serialize-internal.h
+++ b/include/babeltrace/ctf-writer/serialize-internal.h
@@ -37,6 +37,7 @@
 #include <babeltrace/ctf-ir/fields-internal.h>
 #include <babeltrace/align-internal.h>
 #include <babeltrace/mmap-align-internal.h>
+#include <babeltrace/types.h>
 
 struct bt_ctf_stream_pos {
 	int fd;
@@ -110,7 +111,7 @@ char *bt_ctf_stream_pos_get_addr(struct bt_ctf_stream_pos *pos)
 {
 	/* Only makes sense to get the address after aligning on CHAR_BIT */
 	assert(!(pos->offset % CHAR_BIT));
-	return mmap_align_addr(pos->base_mma) +
+	return ((char *) mmap_align_addr(pos->base_mma)) +
 		pos->mmap_base_offset + (pos->offset / CHAR_BIT);
 }
 
@@ -130,7 +131,7 @@ int bt_ctf_stream_pos_init(struct bt_ctf_stream_pos *pos,
 		pos->flags = MAP_SHARED;
 		break;
 	default:
-		assert(false);
+		assert(BT_FALSE);
 	}
 
 	return 0;