From cf6501eb45408c83467160c8ed026c6aab347642 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 11 Apr 2016 11:31:17 -0700 Subject: Windows: Remove the need for _CRT_NONSTDC_NO_DEPRECATE. Replace some function calls with their non-deprecated equivalents so that we can remove _CRT_NONSTDC_NO_DEPRECATE from CMakeLists.txt and config.nmake. Leave _CRT_SECURE_NO_DEPRECATE in place. Removing it failed with 145 warnings and 72 errors. Note that we could probably improve startup performance by using wmem in diam_dict.*. Change-Id: I6e130003de838aebedbdd1aa78c50de8a339ddcb Reviewed-on: https://code.wireshark.org/review/14883 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- tshark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tshark.c') diff --git a/tshark.c b/tshark.c index 408c3be0a6..c97945f12f 100644 --- a/tshark.c +++ b/tshark.c @@ -2280,9 +2280,9 @@ main(int argc, char *argv[]) * suppress the information printed for each packet, but it'll * also suppress the packet counts. */ - if (!isatty(fileno(stderr))) + if (!ws_isatty(ws_fileno(stderr))) print_packet_counts = FALSE; - else if (print_packet_info && isatty(fileno(stdout))) + else if (print_packet_info && ws_isatty(ws_fileno(stdout))) print_packet_counts = FALSE; else if (quiet) print_packet_counts = FALSE; -- cgit v1.2.1