diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-21 11:40:39 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-21 19:41:21 +0000 |
| commit | 0808fc02a5b6f74ca0d8a027834d86cbd5812c7b (patch) | |
| tree | 824564e77a0432a7be179c6c63b6513e66e82a25 /epan/ftypes | |
| parent | 1694e81abe724725edcc31bbecfc0787657e2c13 (diff) | |
64-bit constants need to be wrapped in G_G{U}INT64_CONSTANT().
Otherwise, they don't get the right suffix to tell the compiler that
they're 64-bit even on ILP32 platforms.
Change-Id: I5c52a999d21707602e0a4174a142d1d1036242be
Reviewed-on: https://code.wireshark.org/review/7297
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/ftypes')
| -rw-r--r-- | epan/ftypes/ftype-integer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c index f4463deb71..9c1038d7a0 100644 --- a/epan/ftypes/ftype-integer.c +++ b/epan/ftypes/ftype-integer.c @@ -449,19 +449,19 @@ uint64_from_unparsed(fvalue_t *fv, const char *s, gboolean allow_partial_value, static gboolean uint56_from_unparsed(fvalue_t *fv, const char *s, gboolean allow_partial_value, gchar **err_msg) { - return _uint64_from_unparsed (fv, s, allow_partial_value, err_msg, 0xFFFFFFFFFFFFFF); + return _uint64_from_unparsed (fv, s, allow_partial_value, err_msg, G_GUINT64_CONSTANT(0xFFFFFFFFFFFFFF)); } static gboolean uint48_from_unparsed(fvalue_t *fv, const char *s, gboolean allow_partial_value, gchar **err_msg) { - return _uint64_from_unparsed (fv, s, allow_partial_value, err_msg, 0xFFFFFFFFFFFF); + return _uint64_from_unparsed (fv, s, allow_partial_value, err_msg, G_GUINT64_CONSTANT(0xFFFFFFFFFFFF)); } static gboolean uint40_from_unparsed(fvalue_t *fv, const char *s, gboolean allow_partial_value, gchar **err_msg) { - return _uint64_from_unparsed (fv, s, allow_partial_value, err_msg, 0xFFFFFFFFFF); + return _uint64_from_unparsed (fv, s, allow_partial_value, err_msg, G_GUINT64_CONSTANT(0xFFFFFFFFFF)); } static gboolean @@ -532,19 +532,19 @@ sint64_from_unparsed(fvalue_t *fv, const char *s, gboolean allow_partial_value, static gboolean sint56_from_unparsed(fvalue_t *fv, const char *s, gboolean allow_partial_value, gchar **err_msg) { - return _sint64_from_unparsed (fv, s, allow_partial_value, err_msg, 0x7FFFFFFFFFFFFF, -0x80000000000000); + return _sint64_from_unparsed (fv, s, allow_partial_value, err_msg, G_GINT64_CONSTANT(0x7FFFFFFFFFFFFF), G_GINT64_CONSTANT(-0x80000000000000)); } static gboolean sint48_from_unparsed(fvalue_t *fv, const char *s, gboolean allow_partial_value, gchar **err_msg) { - return _sint64_from_unparsed (fv, s, allow_partial_value, err_msg, 0x7FFFFFFFFFFF, -0x800000000000); + return _sint64_from_unparsed (fv, s, allow_partial_value, err_msg, G_GINT64_CONSTANT(0x7FFFFFFFFFFF), G_GINT64_CONSTANT(-0x800000000000)); } static gboolean sint40_from_unparsed(fvalue_t *fv, const char *s, gboolean allow_partial_value, gchar **err_msg) { - return _sint64_from_unparsed (fv, s, allow_partial_value, err_msg, 0x7FFFFFFFFF, -0x8000000000); + return _sint64_from_unparsed (fv, s, allow_partial_value, err_msg, G_GINT64_CONSTANT(0x7FFFFFFFFF), G_GINT64_CONSTANT(-0x8000000000)); } static int |