From 5fbcfd632a7446da946a8b1e27004a401b8d74f3 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 25 Jan 2017 22:20:07 -0800 Subject: Clean up some UN*X-vs-Windows socket issues. Have a wsutil/socket.h file, for inclusion by everything that uses sockets, that contains the UN*X-vs-Windows #includes and #defines to hide some UN*X-sockets vs. Winsock API differences. That stuff mostly comes from from extcap/extcap-base.h; have that file just include wsutil/socket.h rather than defining that stuff itself. Include it in sharkd_daemon.c. Use socklen_t for the size of things to pass to bind() as the last argument; wsutil/socket.h defines it as int on Windows. Ignore sharkd in Git. Change-Id: I3f2171b7aa613717f52305f62bfd7d43e0172dc6 Reviewed-on: https://code.wireshark.org/review/19796 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- wsutil/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'wsutil/Makefile.am') diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index a8642d4e10..76b968b66b 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -83,6 +83,7 @@ libwsutil_nonrepl_INCLUDES = \ sha2.h \ sign_ext.h \ sober128.h \ + socket.h \ str_util.h \ strnatcmp.h \ strtoi.h \ -- cgit v1.2.1