Skip to content

Commit 35ebda5

Browse files
committed
fixup! msvc: provide a main() wrapper similar to mingw_main()
1 parent 39f9089 commit 35ebda5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

compat/mingw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3039,7 +3039,7 @@ int msc_startup(int argc, wchar_t **w_argv, wchar_t **w_env)
30393039
char **my_utf8_argv = NULL, **save = NULL;
30403040
char *buffer = NULL;
30413041
int maxlen;
3042-
int k, x;
3042+
int k, exit_status;
30433043

30443044
#ifdef _DEBUG
30453045
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
@@ -3094,7 +3094,7 @@ int msc_startup(int argc, wchar_t **w_argv, wchar_t **w_env)
30943094
current_directory_len = GetCurrentDirectoryW(0, NULL);
30953095

30963096
/* invoke the real main() using our utf8 version of argv. */
3097-
int exit_status = msc_main(argc, my_utf8_argv);
3097+
exit_status = msc_main(argc, my_utf8_argv);
30983098

30993099
for (k = 0; k < argc; k++)
31003100
free(save[k]);

compat/mingw.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,7 @@ extern CRITICAL_SECTION pinfo_cs;
702702
#if defined(_MSC_VER)
703703

704704
int msc_startup(int argc, wchar_t **w_argv, wchar_t **w_env);
705+
extern int msc_main(int argc, const char **argv);
705706

706707
#define main(c,v) dummy_decl_msc_main(void); \
707708
int wmain(int my_argc, \

0 commit comments

Comments
 (0)