Win32: Expose wchar main routine only

nobu · hsbt · commit bd95287a0fdd · 2024-11-20T18:18:52.000+09:00
Warned if both of `main` and `wmain` are exposed:
```
LINK : warning LNK4067: ambiguous entry point; selected 'mainCRTStartup'
```
diff --git 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
@@ -1,10 +1,10 @@
 #include <windows.h>
 #include <stdio.h>
 
-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);
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,12 @@`
`30`	`30`	`# undef RUBY_DEBUG_ENV`
`31`	`31`	`#endif`
`32`	`32`
	`33`	`+#ifdef _WIN32`
	`34`	`+#define main(argc, argv) w32_main(argc, argv)`
	`35`	`+static int main(int argc, char **argv);`
	`36`	`+int wmain(void) {return main(0, NULL);}`
	`37`	`+#endif`
	`38`	`+`
`33`	`39`	`int`
`34`	`40`	`main(int argc, char **argv)`
`35`	`41`	`{`
`@@ -47,7 +53,3 @@ main(int argc, char **argv)`
`47`	`53`	`return ruby_run_node(ruby_options(argc, argv));`
`48`	`54`	`}`
`49`	`55`	`}`
`50`		`-`
`51`		`-#ifdef _WIN32`
`52`		`-int wmain(void) {return main(0, NULL);}`
`53`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`#include <windows.h>`
`2`	`2`	`#include <stdio.h>`
`3`	`3`
`4`		`-extern int main(int, char**);`
	`4`	`+extern int wmain(int, WCHAR**);`
`5`	`5`
`6`	`6`	`int WINAPI`
`7`	`7`	`WinMain(HINSTANCE current, HINSTANCE prev, LPSTR cmdline, int showcmd)`
`8`	`8`	`{`
`9`		`- return main(0, NULL);`
	`9`	`+ return wmain(0, NULL);`
`10`	`10`	`}`