diff --git a/main.c b/main.c index f0f1281969..b3441f5cc8 100644 --- a/main.c +++ b/main.c @@ -30,6 +30,12 @@ # undef RUBY_DEBUG_ENV #endif +#ifdef _WIN32 +#define main(argc, argv) w32_main(argc, argv) +static int main(int argc, char **argv); +int wmain(void) {return main(0, NULL);} +#endif + int main(int argc, char **argv) { @@ -47,7 +53,3 @@ main(int argc, char **argv) return ruby_run_node(ruby_options(argc, argv)); } } - -#ifdef _WIN32 -int wmain(void) {return main(0, NULL);} -#endif diff --git a/win32/winmain.c b/win32/winmain.c index 467a835d29..a9f38099db 100644 --- a/win32/winmain.c +++ b/win32/winmain.c @@ -1,10 +1,10 @@ #include #include -extern int main(int, char**); +extern int wmain(int, WCHAR**); int WINAPI WinMain(HINSTANCE current, HINSTANCE prev, LPSTR cmdline, int showcmd) { - return main(0, NULL); + return wmain(0, NULL); }