X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Ftime.h;h=d826e4ac93d54b5cdb5d4d71e6101a6462b6174b;hb=50a17d39f400ea81443447d61c6c36470fb9c68f;hp=483e2e58a5bf3a8d21fb8c9572506ad55173d36b;hpb=7db8c19d0e7ea91bee71e2fd6cb035568223ff05;p=lttv.git diff --git a/ltt/branches/poly/ltt/time.h b/ltt/branches/poly/ltt/time.h index 483e2e58..d826e4ac 100644 --- a/ltt/branches/poly/ltt/time.h +++ b/ltt/branches/poly/ltt/time.h @@ -21,6 +21,7 @@ #include #include +#include typedef struct _LttTime { unsigned long tv_sec; @@ -212,7 +213,7 @@ static inline LttTime ltt_time_div(LttTime t1, double d) static inline guint64 ltt_time_to_uint64(LttTime t1) { - return (guint64)((t1.tv_sec*LTT_TIME_UINT_SHIFT_CONST) >> LTT_TIME_UINT_SHIFT) + return (((guint64)t1.tv_sec*LTT_TIME_UINT_SHIFT_CONST) << LTT_TIME_UINT_SHIFT) + (guint64)t1.tv_nsec; }