diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-04-11 11:31:17 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-04-13 02:16:20 +0000 |
| commit | cf6501eb45408c83467160c8ed026c6aab347642 (patch) | |
| tree | 84755bcc3bbdb9a1b7dcc69e171ab2f947f0ed0a /editcap.c | |
| parent | f6b8b4dca5c05f0e6011ca8d8ef670beb911ac39 (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 'editcap.c')
| -rw-r--r-- | editcap.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -63,7 +63,6 @@ #endif #ifdef _WIN32 -#include <wsutil/file_util.h> #include <wsutil/unicode-utils.h> #include <process.h> /* getpid */ #ifdef HAVE_WINSOCK2_H @@ -77,6 +76,7 @@ #include <wsutil/crash_info.h> #include <wsutil/filesystem.h> +#include <wsutil/file_util.h> #include <wsutil/md5.h> #include <wsutil/plugins.h> #include <wsutil/privileges.h> @@ -1165,7 +1165,7 @@ main(int argc, char *argv[]) optarg); exit(1); } - srand( (unsigned int) (time(NULL) + getpid()) ); + srand( (unsigned int) (time(NULL) + ws_getpid()) ); break; case 'F': @@ -2014,4 +2014,3 @@ handle_chopping(chop_t chop, struct wtap_pkthdr *out_phdr, * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - |