aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-04-11 11:31:17 -0700
committerMichael Mann <mmann78@netscape.net>2016-04-13 02:16:20 +0000
commitcf6501eb45408c83467160c8ed026c6aab347642 (patch)
tree84755bcc3bbdb9a1b7dcc69e171ab2f947f0ed0a /tshark.c
parentf6b8b4dca5c05f0e6011ca8d8ef670beb911ac39 (diff)
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 <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c4
1 files changed, 2 insertions, 2 deletions
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;