From 20ad0ffbaf1d49bf3da50a62c0bed93f765b9e31 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 3 Jan 2019 12:21:19 -0800 Subject: 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 --- wsutil/socket.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wsutil/socket.h b/wsutil/socket.h index 5e79ac54f9..ca30d807c2 100644 --- a/wsutil/socket.h +++ b/wsutil/socket.h @@ -36,7 +36,9 @@ #define closesocket(socket) close(socket) #define socket_handle_t int +#ifndef INVALID_SOCKET #define INVALID_SOCKET (-1) +#endif #define SOCKET_ERROR (-1) #endif -- cgit v1.2.3