[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0ce320b7333022976618f78f72d94d3c4d74682e
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.4
Repository: wireshark

Commits:

0ce320b 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 20ad0ffbaf1d49bf3da50a62c0bed93f765b9e31)
    Reviewed-on: https://code.wireshark.org/review/31346
    

Actions performed:

    from  5f7ba27   wsutil: fix crash due to corruption of the "small_buffers" array
     add  0ce320b   Avoid definition collisions for INVALID_SOCKET.


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