diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:02:25 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:02:25 +0000 |
| commit | 089dfcd1085ac242322b8e90845ad9913ac7fcd3 (patch) | |
| tree | e838e807832ae7cc6fe4861cc9c06103630db771 /epan/ftypes/ftype-bytes.c | |
| parent | c3a054e6c196eacb944027cf8306a250bc1144a3 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48424
Diffstat (limited to 'epan/ftypes/ftype-bytes.c')
| -rw-r--r-- | epan/ftypes/ftype-bytes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index e9ece85f02..9a0bd552db 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -145,7 +145,7 @@ static void ax25_fvalue_set(fvalue_t *fv, gpointer value, gboolean already_copied) { g_assert(!already_copied); - common_fvalue_set(fv, value, FT_AX25_ADDR_LEN); + common_fvalue_set(fv, (guint8 *)value, FT_AX25_ADDR_LEN); } static void @@ -490,7 +490,7 @@ cmp_matches(const fvalue_t *fv_a, const fvalue_t *fv_b) a->data, /* The data to check for the pattern... */ (int)a->len, /* ... and its length */ 0, /* Start offset within data */ - 0, /* GRegexMatchFlags */ + (GRegexMatchFlags)0, /* GRegexMatchFlags */ NULL, /* We are not interested in the match information */ NULL /* We don't want error information */ ); |