X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-cpu-id.c;h=3f6462e65916cc0383a223722f2826e0d7a7aada;hb=8406222c45d29b23064d688e33be84894a51baac;hp=7cbf3cea46a1a39857c12a1e4c3278d15e38bd69;hpb=3fbec7dc3645facd9e809cf161ba3435a377ce56;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c
index 7cbf3cea..3f6462e6 100644
--- a/liblttng-ust/lttng-context-cpu-id.c
+++ b/liblttng-ust/lttng-context-cpu-id.c
@@ -26,8 +26,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
+#include <stddef.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <lttng/ust-events.h>
@@ -61,10 +61,7 @@ static
 void cpu_id_get_value(struct lttng_ctx_field *field,
 		struct lttng_ctx_value *value)
 {
-	int cpu;
-
-	cpu = lttng_ust_get_cpu();
-	value->u.s64 = cpu;
+	value->u.s64 = lttng_ust_get_cpu();
 }
 
 int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
@@ -80,12 +77,12 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ctx **ctx)
 	}
 	field->event_field.name = "cpu_id";
 	field->event_field.type.atype = atype_integer;
-	field->event_field.type.u.basic.integer.size = sizeof(int) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.alignment = lttng_alignof(int) * CHAR_BIT;
-	field->event_field.type.u.basic.integer.signedness = lttng_is_signed_type(int);
-	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;
+	field->event_field.type.u.integer.size = sizeof(int) * CHAR_BIT;
+	field->event_field.type.u.integer.alignment = lttng_alignof(int) * CHAR_BIT;
+	field->event_field.type.u.integer.signedness = lttng_is_signed_type(int);
+	field->event_field.type.u.integer.reverse_byte_order = 0;
+	field->event_field.type.u.integer.base = 10;
+	field->event_field.type.u.integer.encoding = lttng_encode_none;
 	field->get_size = cpu_id_get_size;
 	field->record = cpu_id_record;
 	field->get_value = cpu_id_get_value;