Wireshark-commits: [Wireshark-commits] master 220772d: text2pcap: fix -Wmacro-redefined warning
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, 27 Feb 2017 12:53:04 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=220772dc19ef8b9c20a919375b47390a794c4e42
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

220772d by Peter Wu (peter@xxxxxxxxxxxxx):

    text2pcap: fix -Wmacro-redefined warning
    
    With flex 2.6.3, this warning is observed (which causes a build failure
    when -Werror is not disabled:
    
        text2pcap-scanner.c:398:9: warning: 'yywrap' macro redefined [-Wmacro-redefined]
        #define yywrap() (/*CONSTCOND*/1)
                ^
        text2pcap-scanner.c:76:13: note: previous definition is here
            #define yywrap yywrap
    
    Issue is specific to flex 2.6.3 and resolved upstream at
    https://github.com/westes/flex/issues/162
    
    Change-Id: I861565f5080f87a9457427e7a63b5d9256c49e85
    Reviewed-on: https://code.wireshark.org/review/20294
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  4b2a2eb   wslua: fix documentation of Struct.fromhex
    adds  220772d   text2pcap: fix -Wmacro-redefined warning


Summary of changes:
 text2pcap-scanner.l |    6 ++++++
 text2pcap.c         |    6 +++---
 text2pcap.h         |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)