Wireshark-commits: [Wireshark-commits] master-3.2 edf5e20: ui: Define plugins_add_description() unc
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: Mon, 20 Jan 2020 10:40:32 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=edf5e20780a17bbf8fab9fa7c2f3b2ffb94ecd80
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-3.2
Repository: wireshark

Commits:

edf5e20 by Jeroen Roovers (jer@xxxxxxxxxx):

    ui: Define plugins_add_description() unconditionally
    
    Since commit 5dfde7ff ("Print extcap plugins with "tshark -G
    plugins"."), compiling with -DENABLE_LUA=no -DENABLE_PLUGINS=no fails.
    The definition of plugins_add_description() is guarded by HAVE_PLUGINS
    || HAVE_LUA, but that definition is used without such guards for extcap
    right below, resulting in:
    
    ui/qt/about_dialog.cpp:137:29: error: 'plugins_add_description' was not
    declared in this scope
    
    Fix this by removing the guards around plugins_add_description().
    
    Change-Id: Ieaddfed923ae3782ade28b2f5004b6a34220659a
    Fixes: 5dfde7ff83a35bb7186cd05ce61f4b139ab01203
    Reviewed-on: https://code.wireshark.org/review/35852
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit f605e9466b60c996d88ace1469ec19ecc44b46dd)
    Reviewed-on: https://code.wireshark.org/review/35870
    

Actions performed:

    from  6e4ceeb   [Automatic update for 2020-01-19]
     add  edf5e20   ui: Define plugins_add_description() unconditionally


Summary of changes:
 ui/qt/about_dialog.cpp | 2 --
 1 file changed, 2 deletions(-)