X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Finclude%2Fltt%2Ftype.h;h=3e5679755dc2a8d043b812e93db59dabffc2b1a6;hb=daecc161cdd7a5931dc553307e3509010076ac35;hp=acbd7d6754baf595a8f584a00dd61d5879ab55fd;hpb=290dfc8c6f0882260a7a1c39b87873016d678d0b;p=lttv.git

diff --git a/ltt/branches/poly/include/ltt/type.h b/ltt/branches/poly/include/ltt/type.h
index acbd7d67..3e567975 100644
--- a/ltt/branches/poly/include/ltt/type.h
+++ b/ltt/branches/poly/include/ltt/type.h
@@ -1,16 +1,16 @@
 #ifndef TYPE_H
 #define TYPE_H
 
-#include <ltt/ltt.h>
-
 
 /* Different types allowed */
 
 typedef enum _LttTypeEnum 
 { LTT_INT, LTT_UINT, LTT_FLOAT, LTT_STRING, LTT_ENUM, LTT_ARRAY, 
-  LTT_SEQUENCE, LTT_STRUCT
+  LTT_SEQUENCE, LTT_STRUCT, LTT_UNION
 } LttTypeEnum;
 
+#include <ltt/ltt.h>
+
 
 /* All event types, data types and fields belong to their trace and 
    are released at the same time. */
@@ -24,9 +24,9 @@ char *ltt_eventtype_description(LttEventType *et);
 
 LttFacility *ltt_eventtype_facility(LttEventType *et);
 
-unsigned *ltt_eventtype_relative_id(LttEventType *et);
+unsigned ltt_eventtype_relative_id(LttEventType *et);
 
-unsigned *ltt_eventtype_id(LttEventType *et);
+unsigned ltt_eventtype_id(LttEventType *et);
 
 LttType *ltt_eventtype_type(LttEventType *et);
 
@@ -41,7 +41,7 @@ char *ltt_type_name(LttType *t);
 
 LttTypeEnum ltt_type_class(LttType *t);
 
-unsigned ltt_type_size(LttTracefile *tf, LttType *t); 
+unsigned ltt_type_size(LttTrace *trace, LttType *t); 
 
 
 /* The type of nested elements for arrays and sequences. */
@@ -54,14 +54,14 @@ LttType *ltt_type_element_type(LttType *t);
 unsigned ltt_type_element_number(LttType *t);
 
 
-/* The number of data members for structures. */
+/* The number of data members for structures and unions. */
 
 unsigned ltt_type_member_number(LttType *t);
 
 
 /* The type of a data member in a structure. */
 
-LttType *ltt_type_member_type(LttType *t, unsigned i);
+LttType *ltt_type_member_type(LttType *t, unsigned i, char ** name);
 
 
 /* For enumerations, obtain the symbolic string associated with a value