Re: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c

2014-05-03 Thread Marat Radchenko
On Wed, Apr 30, 2014 at 10:35:56AM +0200, Karsten Blees wrote: > Am 29.04.2014 11:12, schrieb Marat Radchenko: > > On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function. > > Fix `warning: passing argument 2 of 'mingw_main' from incompatible > > pointer type` in http-fetch.c and remote-cu

Re: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c

2014-04-30 Thread Stepan Kasal
able to handle the conflict. From: Marat Radchenko Subject: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c Date: Tue, 29 Apr 2014 13:12:02 +0400 On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function. Fix `warning: passing argument 2 of 'mingw_m

Re: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c

2014-04-30 Thread Felipe Contreras
Johannes Schindelin wrote: > On Wed, 30 Apr 2014, Erik Faye-Lund wrote: > > > While it's certainly a good point, I think this is *our* fault for not > > upstreaming our changes, and the responsibility of cleaning up merges > > should lie on our shoulders. We've diverged a lot. Sure, Dscho does a >

Re: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c

2014-04-30 Thread Johannes Schindelin
Hi kusma, On Wed, 30 Apr 2014, Erik Faye-Lund wrote: > While it's certainly a good point, I think this is *our* fault for not > upstreaming our changes, and the responsibility of cleaning up merges > should lie on our shoulders. We've diverged a lot. Sure, Dscho does a > great job making the dive

Re: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c

2014-04-30 Thread Erik Faye-Lund
On Wed, Apr 30, 2014 at 10:35 AM, Karsten Blees wrote: > Am 29.04.2014 11:12, schrieb Marat Radchenko: >> On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function. >> Fix `warning: passing argument 2 of 'mingw_main' from incompatible >> pointer type` in http-fetch.c and remote-curl.c by dr

Re: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c

2014-04-30 Thread Karsten Blees
Am 29.04.2014 11:12, schrieb Marat Radchenko: > On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function. > Fix `warning: passing argument 2 of 'mingw_main' from incompatible > pointer type` in http-fetch.c and remote-curl.c by dropping 'const'. > Would you mind cross checking your change

[PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c

2014-04-29 Thread Marat Radchenko
On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function. Fix `warning: passing argument 2 of 'mingw_main' from incompatible pointer type` in http-fetch.c and remote-curl.c by dropping 'const'. Signed-off-by: Marat Radchenko --- http-fetch.c | 5 +++-- remote-curl.c | 2 +- 2 files chan