From e2e5b01d771339a596a418ec306fe00ab504e593 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Wed, 26 Dec 2018 18:10:12 +0100 Subject: cli_main: remove real_main from stack traces for non-Windows Restore the "main" name since that is used everywhere else except for Windows. On Windows, "main" is renamed via a macro to avoid a conflict with "wmain" and to allow it to be called in cli_main.c. For those wondering, GUI applications (such as Qt) have a different entry point, namely WinMain. In Qt5, src/winmain/qtmain_win.cpp defines WinMain, but seems to convert its arguments from Unicode to CP_ACP (ASCII). It might not support UTF-8, but I did not verify this. Change-Id: I93fa59324eb2ef95a305b08fc5ba34d49cc73bf0 Reviewed-on: https://code.wireshark.org/review/31208 Petri-Dish: Peter Wu Reviewed-by: Anders Broman --- extcap/ciscodump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extcap/ciscodump.c') diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c index 798cb7ac50..19a563c335 100644 --- a/extcap/ciscodump.c +++ b/extcap/ciscodump.c @@ -515,7 +515,7 @@ static int list_config(char *interface, unsigned int remote_port) return EXIT_SUCCESS; } -int real_main(int argc, char **argv) +int main(int argc, char *argv[]) { int result; int option_idx = 0; -- cgit v1.2.3