undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modify mingw_main() workaround to avoid link errors

Browse Source 
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>
This commit is contained in:
Steffen Prohaska 2008-07-26 11:41:44 +02:00 committed by Junio C Hamano
parent 57b0fc4516
commit 22537765f5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compat/mingw.h
View File

@ -228,9 +228,10 @@ char **env_setenv(char **env, const char *name);
* A replacement of main() that ensures that argv[0] has a path * A replacement of main() that ensures that argv[0] has a path
*/ */
#define main(c,v) main(int argc, const char **argv) \ #define main(c,v) dummy_decl_mingw_main(); \
static int mingw_main(); \
int main(int argc, const char **argv) \
{ \ { \
static int mingw_main(); \
argv[0] = xstrdup(_pgmptr); \ argv[0] = xstrdup(_pgmptr); \
return mingw_main(argc, argv); \ return mingw_main(argc, argv); \
} \ } \