Modify mingw_main() workaround to avoid link errors
With MinGW's gcc.exe (GCC) 3.4.5 (mingw special) GNU ld version 2.17.50 20060824 the old define caused link errors: git.o: In function `main': C:/msysgit/git/git.c:500: undefined reference to `mingw_main' collect2: ld returned 1 exit status The modified define works. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Acked-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Steffen Prohaska committed
Jul 26, 2008 at 11:41 UTC
22537765f51de92115592ac0a15981b8d27ef908
1 file changed
+3
-2
compat/mingw.h
+3
-2
@@ -228,9 +228,10 @@ char **env_setenv(char **env, const char *name);
228
* A replacement of main() that ensures that argv[0] has a path
229
*/
230
231
-#define main(c,v) main(int argc, const char **argv) \
231
+#define main(c,v) dummy_decl_mingw_main(); \
232
+static int mingw_main(); \
233
+int main(int argc, const char **argv) \
234
{ \
233
- static int mingw_main(); \
235
argv[0] = xstrdup(_pgmptr); \
236
return mingw_main(argc, argv); \
237
} \