Wireshark-commits: [Wireshark-commits] master-2.0 b604fa7: gtk: fix 32-bit build
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 1 Sep 2016 08:24:54 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b604fa7488cb03d7cb7c7e5392eab6e352cd26e8
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

b604fa7 by Peter Wu (peter@xxxxxxxxxxxxx):

    gtk: fix 32-bit build
    
    32-bit glib before 2.31.2 expand GUINT_TO_POINTER(x) as (gpointer)x.
    add explicit cast since curr_layer_num is 8 bits. Fixes
    v1.99.10rc0-179-g1d7bcb2.
    
    Storing a 64-bit integer into a 32-bit pointer makes the compiler
    complain. Add explicit cast. Fixes v1.99.1rc0-76-ged0b19b.
    
    Change-Id: I75fdf17882a0f5ddce7d3b3e74b1bf80ff6cd4ae
    Reviewed-on: https://code.wireshark.org/review/17417
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit e3c3d7a4afeeb8bc0519717e6c85c038fb99170a)
    Reviewed-on: https://code.wireshark.org/review/17436
    

Actions performed:

    from  b5fa164   OSSP: Retrieve OUI at proper offset in packet
    adds  b604fa7   gtk: fix 32-bit build


Summary of changes:
 ui/gtk/decode_as_dlg.c |    2 +-
 ui/gtk/packet_panes.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)