X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fshm.h;h=dab0b68d561b9ce1a05df0bc421f5ebb9a20e144;hb=4041a8a71441f133654c4ca2a187748e08f03b22;hp=64507463dadb8cc0fe1d2f9e7bc5d36a09546179;hpb=5198080d2234eb06e95d245d0a9747810f496475;p=lttng-ust.git

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index 64507463..dab0b68d 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -64,12 +64,8 @@ char *_shmp_offset(struct shm_object_table *table, struct shm_ref *ref,
 	return &obj->memory_map[ref_offset];
 }
 
-#define shmp_index(handle, ref, index)					\
-	({								\
-		__typeof__((ref)._type) ____ptr_ret;			\
-		____ptr_ret = (__typeof__(____ptr_ret)) _shmp_offset((handle)->table, &(ref)._ref, index, sizeof(*____ptr_ret));	\
-		____ptr_ret;						\
-	})
+#define shmp_index(handle, ref, index)	\
+	((__typeof__((ref)._type)) _shmp_offset((handle)->table, &(ref)._ref, index, sizeof(*((ref)._type))))
 
 #define shmp(handle, ref)	shmp_index(handle, ref, 0)