diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-08-26 19:40:46 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-08-26 19:40:46 +0000 |
| commit | 98473c77b6976eabae05a806af860d645fbf0cc7 (patch) | |
| tree | 68934343e3f03b0f509d3e4964f93ac45816a918 /wiretap/erf.h | |
| parent | 6f42e3ce750fd4c65559b2530919f8d07f4b159f (diff) | |
| download | wireshark-98473c77b6976eabae05a806af860d645fbf0cc7.tar.gz | |
Ethereal now requires 64-bit integer support, so get rid of the tests of
G_HAVE_GINT64.
Get rid of the floating-point stuff in the Etherpeek Classic file
reading code, just use 64-bit integers. Fix up the calculation of the
nanoseconds portion of the time stamp.
svn path=/trunk/; revision=15544
Diffstat (limited to 'wiretap/erf.h')
| -rw-r--r-- | wiretap/erf.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/wiretap/erf.h b/wiretap/erf.h index 0b99fbc80d..6be021bd19 100644 --- a/wiretap/erf.h +++ b/wiretap/erf.h @@ -47,14 +47,9 @@ /* * The timestamp is 64bit unsigned fixed point little-endian value with - * 32 bits for second and 32 bits for fraction. For portablility it is - * given as two 32 bit valies here, ts[1] == secs, ts[0] == fraction + * 32 bits for second and 32 bits for fraction. */ -#ifdef G_HAVE_GINT64 typedef guint64 erf_timestamp_t; -#else -typedef guint32 erf_timestamp_t[2]; -#endif typedef struct erf_record { erf_timestamp_t ts; |