From 9a9c72cceab5d6cdd9bdd7650e038aac4f697013 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 16 Jul 2016 12:09:27 -0400 Subject: Have extcap executables mirror the GTK's WinMain signature. This is for appeasing VS Code Analysis. Change-Id: Ib7b3d8a3025dd764da283335051d0f77b45f6dee Reviewed-on: https://code.wireshark.org/review/16499 Reviewed-by: Michael Mann --- extcap/androiddump.c | 8 ++++++-- extcap/ciscodump.c | 8 ++++++-- extcap/randpktdump.c | 8 ++++++-- extcap/sshdump.c | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 07a2f77ad8..442f15deac 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -2699,8 +2699,12 @@ int main(int argc, char **argv) { } #ifdef _WIN32 -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, int nCmdShow) { +int _stdcall +WinMain (struct HINSTANCE__ *hInstance, + struct HINSTANCE__ *hPrevInstance, + char *lpszCmdLine, + int nCmdShow) +{ return main(__argc, __argv); } #endif diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c index 5ca4581910..a519e0912b 100644 --- a/extcap/ciscodump.c +++ b/extcap/ciscodump.c @@ -729,8 +729,12 @@ end: } #ifdef _WIN32 -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, int nCmdShow) { +int _stdcall +WinMain (struct HINSTANCE__ *hInstance, + struct HINSTANCE__ *hPrevInstance, + char *lpszCmdLine, + int nCmdShow) +{ return main(__argc, __argv); } #endif diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c index d0cb4cf9d6..0235470883 100644 --- a/extcap/randpktdump.c +++ b/extcap/randpktdump.c @@ -335,8 +335,12 @@ end: } #ifdef _WIN32 -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, int nCmdShow) { +int _stdcall +WinMain (struct HINSTANCE__ *hInstance, + struct HINSTANCE__ *hPrevInstance, + char *lpszCmdLine, + int nCmdShow) +{ return main(__argc, __argv); } #endif diff --git a/extcap/sshdump.c b/extcap/sshdump.c index 94cf27de19..ab6988450f 100644 --- a/extcap/sshdump.c +++ b/extcap/sshdump.c @@ -528,8 +528,12 @@ end: } #ifdef _WIN32 -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, int nCmdShow) { +int _stdcall +WinMain (struct HINSTANCE__ *hInstance, + struct HINSTANCE__ *hPrevInstance, + char *lpszCmdLine, + int nCmdShow) +{ return main(__argc, __argv); } #endif -- cgit v1.2.3