On Thu, Jul 02, 2020 at 02:25:29PM +0200, Pavel Hrdina wrote: > With meson introduction which is using the same CFLAGS for the whole > project some compilation errors were discovered. > > Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> > --- > tools/wireshark/src/packet-libvirt.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c > index 20b7a3ec812..db8efe45a39 100644 > --- a/tools/wireshark/src/packet-libvirt.c > +++ b/tools/wireshark/src/packet-libvirt.c > @@ -77,15 +77,15 @@ static gint ett_libvirt_stream_hole = -1; > > XDR_PRIMITIVE_DISSECTOR(int, gint32, int) > XDR_PRIMITIVE_DISSECTOR(u_int, guint32, uint) > -XDR_PRIMITIVE_DISSECTOR(short, gint16, int) > +//XDR_PRIMITIVE_DISSECTOR(short, gint16, int) > XDR_PRIMITIVE_DISSECTOR(u_short, guint16, uint) > XDR_PRIMITIVE_DISSECTOR(char, gchar, int) > XDR_PRIMITIVE_DISSECTOR(u_char, guchar, uint) > XDR_PRIMITIVE_DISSECTOR(hyper, gint64, int64) > XDR_PRIMITIVE_DISSECTOR(u_hyper, guint64, uint64) > -XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) > +//XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) > XDR_PRIMITIVE_DISSECTOR(double, gdouble, double) > -XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) > +//XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) This looks a bit iffy - what's the rationale for this ? Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
