git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: karsten.blees@dcon.de
Cc: Johannes Sixt <j.sixt@viscovery.net>,
	git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	msysgit@googlegroups.com, johannes.schindelin@gmx.de
Subject: Re: [PATCH] Fix compat/regex ANSIfication on MinGW
Date: Fri, 3 Sep 2010 22:21:36 +0000	[thread overview]
Message-ID: <AANLkTikqWap4nUamS=bx6oJ7mhUTEkFWpf7Hf=Mv1Ek=@mail.gmail.com> (raw)
In-Reply-To: <OFF09696E1.DC0D98D7-ONC1257793.0070A82E-C1257793.00758522@DCON.DE>

On Fri, Sep 3, 2010 at 21:23,  <karsten.blees@dcon.de> wrote:
>
> Johannes Sixt <j.sixt@viscovery.net> 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...
>
> There're basically three solutions:
> 1. revert the whole ANSIfication stuff (stay in sync with glibc upstream)
> 2. add internal_function before function definition (like everywhere else in
> regexec.c - efe33c61 in git://repo.or.cz/git/mingw/4msysgit.git)
> 3. remove internal_function from declaration (ce518bbd)
>
> As I don't think you plan active development on this (or push changes
> upstream?), I'd opt for (1).

Yeah, wasn't the only reason they were ANSI-fied because Junio had
some script in the todo branch that explicitly used -Werror in
conjunction with a warning for k&r declerations/

I've forgotten what all these fixes to compat/regex were about, but if
that's the case 1) looks simplest.

  reply	other threads:[~2010-09-03 22:21 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-18 22:27 What's cooking in git.git (Aug 2010, #04; Wed, 18) Junio C Hamano
2010-08-19  3:02 ` Jonathan Nieder
2010-08-19  8:06   ` Johannes Sixt
2010-08-19 12:48     ` Ævar Arnfjörð Bjarmason
2010-08-19 15:04       ` Ævar Arnfjörð Bjarmason
     [not found]       ` <AANLkTinkjsLycvV-uvfG14t7Q=uKt+pnpizKCPGirVW1@mail.gmail.com>
2010-08-19 18:05         ` Fwd: " Aharon Robbins
2010-08-19 18:30           ` [PATCH] compat/regex: define out variables only used under RE_ENABLE_I18N Ævar Arnfjörð Bjarmason
2010-08-19 20:02             ` Junio C Hamano
2010-08-19 20:31               ` Ævar Arnfjörð Bjarmason
2010-08-19 21:07                 ` Junio C Hamano
2010-08-19 21:30                   ` Ævar Arnfjörð Bjarmason
2010-08-19 22:45                   ` [PATCH] compat/regex: get rid of old-style definition Junio C Hamano
2010-08-20  7:47                     ` Ævar Arnfjörð Bjarmason
2010-08-25 18:24                     ` Karsten Blees
2010-08-26  7:58                       ` [PATCH] Fix compat/regex ANSIfication on MinGW Johannes Sixt
2010-08-26 20:34                         ` Ævar Arnfjörð Bjarmason
2010-09-03 21:23                         ` karsten.blees
2010-09-03 22:21                           ` Ævar Arnfjörð Bjarmason [this message]
2010-09-04  5:22                             ` Junio C Hamano
2010-09-07 12:56                           ` Johannes Sixt
2010-08-19  3:22 ` jn/update-contrib-example-merge in pu Jonathan Nieder
2010-08-19 12:53 ` What's cooking in git.git (Aug 2010, #04; Wed, 18) Ævar Arnfjörð Bjarmason
2010-08-19 15:27   ` Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='AANLkTikqWap4nUamS=bx6oJ7mhUTEkFWpf7Hf=Mv1Ek=@mail.gmail.com' \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j.sixt@viscovery.net \
    --cc=johannes.schindelin@gmx.de \
    --cc=karsten.blees@dcon.de \
    --cc=msysgit@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).