X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Flttng-context-pthread-id.c;h=62eda808786d01b1cf7eb165d4915a0e909b6a40;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=f65968bf3c5f9c681b79de3b4d2778ec228b3859;hpb=8173ec7c273a8f083f35bbcd850718a4e6a1f253;p=lttng-ust.git

diff --git a/libust/lttng-context-pthread-id.c b/libust/lttng-context-pthread-id.c
index f65968bf..62eda808 100644
--- a/libust/lttng-context-pthread-id.c
+++ b/libust/lttng-context-pthread-id.c
@@ -8,23 +8,23 @@
  */
 
 #include <pthread.h>
-#include <ust/lttng-events.h>
-#include <ust/lttng-tracer.h>
-#include <ust/ringbuffer-config.h>
+#include <lttng/ust-events.h>
+#include <lttng/ust-tracer.h>
+#include <lttng/ringbuffer-config.h>
 
 static
 size_t pthread_id_get_size(size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(pid_t));
-	size += sizeof(pid_t);
+	size += lib_ring_buffer_align(offset, lttng_alignof(unsigned long));
+	size += sizeof(unsigned long);
 	return size;
 }
 
 static
 void pthread_id_record(struct lttng_ctx_field *field,
-		 struct lib_ring_buffer_ctx *ctx,
+		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct ltt_channel *chan)
 {
 	unsigned long pthread_id;
@@ -47,9 +47,9 @@ int lttng_add_pthread_id_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "pthread_id";
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(pid_t) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(pid_t);
+	field->event_field.type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
+	field->event_field.type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
+	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
 	field->event_field.type.u.basic.integer.reverse_byte_order = 0;
 	field->event_field.type.u.basic.integer.base = 10;
 	field->event_field.type.u.basic.integer.encoding = lttng_encode_none;