diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-20 22:39:32 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-20 22:39:32 +0000 |
| commit | 064082e68a3aa3a5c4fcc58bb2d3e1f7989939d1 (patch) | |
| tree | dbf3b26c28f19e5be18d0c19f671a3a992aca5c8 /wiretap | |
| parent | 90c8f5dde0f90e508819918cb5fba86f9735716f (diff) | |
| download | wireshark-064082e68a3aa3a5c4fcc58bb2d3e1f7989939d1.tar.gz | |
Change G_GINT64_CONSTANT(xxxxU) to G_GUINT64_CONSTANT(xxxx)
svn path=/trunk/; revision=54314
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/ngsniffer.c | 8 | ||||
| -rw-r--r-- | wiretap/vwr.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index af055a3cdb..9c18623504 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -1246,8 +1246,8 @@ found: /* * Convert to seconds and picoseconds. */ - tsecs = t/G_GINT64_CONSTANT(1000000000000U); - tpsecs = t - tsecs*G_GINT64_CONSTANT(1000000000000U); + tsecs = t/G_GUINT64_CONSTANT(1000000000000); + tpsecs = t - tsecs*G_GUINT64_CONSTANT(1000000000000); /* * Add in the time_day value (86400 seconds/day). @@ -2183,8 +2183,8 @@ ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, rec_hdr.time_day = (guint8)(tsecs / 86400); /* # days of capture - 86400 secs/day */ tsecs -= rec_hdr.time_day * 86400; /* time within day */ /* Convert to picoseconds */ - t = tsecs*G_GINT64_CONSTANT(1000000000000U) + - phdr->ts.nsecs*G_GINT64_CONSTANT(1000U); + t = tsecs*G_GUINT64_CONSTANT(1000000000000) + + phdr->ts.nsecs*G_GUINT64_CONSTANT(1000); /* Convert to units of timeunit = 1 */ t /= Psec[1]; t_low = (guint16)((t >> 0) & 0xFFFF); diff --git a/wiretap/vwr.c b/wiretap/vwr.c index dcb99b9b65..149455c1c3 100644 --- a/wiretap/vwr.c +++ b/wiretap/vwr.c @@ -35,10 +35,10 @@ /* platform-specific definitions for portability */ /* unsigned long long constants */ -# define NS_IN_US G_GINT64_CONSTANT(1000U) /* nanoseconds-to-microseconds */ -# define NS_IN_SEC G_GINT64_CONSTANT(1000000000U) /* nanoseconds-to-seconds */ -# define US_IN_SEC G_GINT64_CONSTANT(1000000U) /* microseconds-to-seconds */ -# define LL_ZERO G_GINT64_CONSTANT(0U) /* zero in unsigned long long */ +# define NS_IN_US G_GUINT64_CONSTANT(1000) /* nanoseconds-to-microseconds */ +# define NS_IN_SEC G_GUINT64_CONSTANT(1000000000) /* nanoseconds-to-seconds */ +# define US_IN_SEC G_GUINT64_CONSTANT(1000000) /* microseconds-to-seconds */ +# define LL_ZERO G_GUINT64_CONSTANT(0) /* zero in unsigned long long */ /* * Fetch a 64-bit value in "Corey-endian" form. |