diff options
| author | Sebastien Tandel <sebastien@tandel.be> | 2007-05-29 02:43:18 +0000 |
|---|---|---|
| committer | Sebastien Tandel <sebastien@tandel.be> | 2007-05-29 02:43:18 +0000 |
| commit | 76729e5d0fdd675b3c070a33ab5bad7e0f8209da (patch) | |
| tree | e9b3ac7fac6b834fccfe5f442a9c7d05d725ed54 /wiretap/catapult_dct2000.c | |
| parent | d3d3f9bc6816b536661750f0f341f949350577d3 (diff) | |
From David Howells :
Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an
x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat
4.1.2-8).
The failures fall into two categories:
(1) Casts between pointers and 32-bit integers without an intermediary cast
via 'long' or 'unsigned long'. This results in a compiler warning complaining
about casts between a pointer and an integer of a different size.
(2) Passing values to "%lld" or similar printf-style format options that the
compiler thinks are a different size. Such values need to be cast to 'long
long' or 'unsigned long long'.
svn path=/trunk/; revision=21975
Diffstat (limited to 'wiretap/catapult_dct2000.c')
| -rw-r--r-- | wiretap/catapult_dct2000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c index c92c3b0537..f39bbe03c3 100644 --- a/wiretap/catapult_dct2000.c +++ b/wiretap/catapult_dct2000.c @@ -494,7 +494,7 @@ catapult_dct2000_seek_read(wtap *wth, gint64 seek_off, /* If get here, must have failed */ *err = errno; *err_info = g_strdup_printf("catapult dct2000: seek_read failed to read/parse " - "line at position %lld", seek_off); + "line at position %lld", (long long) seek_off); return FALSE; } @@ -1373,7 +1373,7 @@ gint wth_equal(gconstpointer v, gconstpointer v2) /***********************************************/ guint wth_hash_func(gconstpointer v) { - return (guint)v; + return (guint)(unsigned long)v; } |