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

diff --git a/ltt/branches/poly/include/ltt/type.h b/ltt/branches/poly/include/ltt/type.h
index dd53c096..3e567975 100644
--- a/ltt/branches/poly/include/ltt/type.h
+++ b/ltt/branches/poly/include/ltt/type.h
@@ -1,8 +1,6 @@
 #ifndef TYPE_H
 #define TYPE_H
 
-#include <ltt/ltt.h>
-
 
 /* Different types allowed */
 
@@ -11,6 +9,8 @@ typedef enum _LttTypeEnum
   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. */
@@ -61,7 +61,7 @@ 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