X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fshm.h;h=104eece6e6d1e4f4f3dc3943b9ce48fc84c28626;hb=bfd265823dd6c3b272b92c6e39456e851bfd51ce;hp=6cac7295f2189012033dd084f03958e4743bffc3;hpb=b5a3dfa5923801ddeea22ce70758d1e61200eac2;p=lttng-ust.git

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index 6cac7295..104eece6 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -10,8 +10,8 @@
  */
 
 #include <stdint.h>
-#include <ust/usterr-signal-safe.h>
-#include "ust/core.h"
+#include <usterr-signal-safe.h>
+#include <urcu/compiler.h>
 #include "shm_types.h"
 
 /*
@@ -107,7 +107,7 @@ int shm_get_wait_fd(struct lttng_ust_shm_handle *handle, struct shm_ref *ref)
 
 static inline
 int shm_get_object_data(struct lttng_ust_shm_handle *handle, struct shm_ref *ref,
-		int *shm_fd, int *wait_fd, uint64_t *memory_map_size)
+		int **shm_fd, int **wait_fd, uint64_t **memory_map_size)
 {
 	struct shm_object_table *table = handle->table;
 	struct shm_object *obj;
@@ -117,9 +117,9 @@ int shm_get_object_data(struct lttng_ust_shm_handle *handle, struct shm_ref *ref
 	if (caa_unlikely(index >= table->allocated_len))
 		return -EPERM;
 	obj = &table->objects[index];
-	*shm_fd = obj->shm_fd;
-	*wait_fd = obj->wait_fd[0];
-	*memory_map_size = obj->allocated_len;
+	*shm_fd = &obj->shm_fd;
+	*wait_fd = &obj->wait_fd[0];
+	*memory_map_size = &obj->allocated_len;
 	return 0;
 }