Wireshark-commits: [Wireshark-commits] master e69194a: qt: fix linking error with global_capture_op

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 27 Jun 2016 22:41:13 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e69194ae6513aa0bbf2728df09ec9133ae379714
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

e69194a by Peter Wu (peter@xxxxxxxxxxxxx):

    qt: fix linking error with global_capture_opts
    
    global_capture_opts is already defined by ui/commandline.c which is also
    linked with wireshark-qt.cpp. Remove the duplicate definition to avoid a
    build failure with the gold linker.
    
    Fixes regression from v2.1.1rc0-192-g9b5b444.
    
    Change-Id: I4484e2769bf270dee1ec0378fd9c925e01eaf390
    Reviewed-on: https://code.wireshark.org/review/16175
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  4add8b6   cmake: add idl2wrs-dissectors target for DCERPC
    adds  e69194a   qt: fix linking error with global_capture_opts


Summary of changes:
 wireshark-qt.cpp |    4 ----
 1 file changed, 4 deletions(-)