On Freitag, 3. September 2010, karsten.blees@xxxxxxx wrote: > Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote on 26.08.2010 09:58:26: > > Am 8/25/2010 20:24, schrieb Karsten Blees: > > > this doesn't compile if internal_function is #defined non-empty (e.g. > > on > > > > mingw/msysgit). The old-style definitions work. > > > > > > In file included from compat/regex/regex.c:78: > > > compat/regex/regexec.c:357: error: conflicting types for > > 're_search_2_stub' > > > > compat/regex/regexec.c:44: note: previous declaration of > > > > 're_search_2_stub' was > > > > > here > > > > Here's a fix. > > Sorry, I realize I should've cross-posted this to the msysgit list (adding > cc). > > In the meantime, Dscho has fixed the function definitions in the msysgit > fork like so: > static int internal_function > re_search_2_stub (struct re_pattern_buffer *bufp,... > > Your patch removes internal_function from the declaration, so now it > doesn't compile again... Sorry for the complication. Please feel free to submit a patch that implements the conclusion of this discussion. I don't mind how the problem is solved (but I do agree that moving "internal_funcion" to the front would be cleanest - now that I got to know that this is a possible solution :-). -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html