Wireshark-commits: [Wireshark-commits] master-2.6 97359f5: Avoid definition collisions for INVALID_

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: Thu, 03 Jan 2019 20:22:08 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=97359f5dd161d2b88be887f47650bf5e70979645
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

97359f5 by Guy Harris (guy@xxxxxxxxxxxx):

    Avoid definition collisions for INVALID_SOCKET.
    
    Newer versions of libpcap define it (due to the somewhat infelicitous
    API for "active mode" remote capture, which returns a socket); don't
    define it ourselves if it's already defined.
    
    Change-Id: I620576620fd2708ebd503da696e17b472bc20472
    Reviewed-on: https://code.wireshark.org/review/31344
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 1c0a601a0f319fe945128aa19ff976442e406ab0)
    Reviewed-on: https://code.wireshark.org/review/31345
    

Actions performed:

    from  5b8b5f8   release-notes: document Lua library update
     add  97359f5   Avoid definition collisions for INVALID_SOCKET.


Summary of changes:
 wsutil/socket.h | 2 ++
 1 file changed, 2 insertions(+)