From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH] compat/regex: fix compilation on Windows
Date: Fri, 12 May 2017 12:25:44 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1.1705121219150.146734@virtualbox> (raw)
In-Reply-To: <xmqqd1be98kk.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Fri, 12 May 2017, Junio C Hamano wrote:
> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>
> > The real issue here is that GNU awk's regex implementation assumes a
> > bit too much about the relative sizes of pointers and long integers.
> > What they really want is to use intptr_t.
>
> Good. I got annoyed enough to do the same myself before opening my
> mailbox. One thing that is curious about your version is that it still
> has "#include <stdint.h>" behind HAVE_STDINT_H; when I tried to compile
> an equivalent of your change last night, the compilation failed because
> intptr_t wasn't available without exposing <stdint.h>
>
> Where is Windows build getting its intptr_t, I wonder.
I'd place a bet on this part of compat/mingw.h for GCC builds:
#ifdef __MINGW64_VERSION_MAJOR
#include <stdint.h>
#include <wchar.h>
typedef _sigset_t sigset_t;
#endif
and on this part of git-compat-util.h for MSVC builds:
#ifndef NO_INTTYPES_H
#include <inttypes.h>
#else
#include <stdint.h>
#endif
For the record, it seems that our current version of compat/regex/regex.c
has this:
/* On some systems, limits.h sets RE_DUP_MAX to a lower value than
GNU regex allows. Include it before <regex.h>, which correctly
#undefs RE_DUP_MAX and sets it to the right value. */
#include <limits.h>
#include <stdint.h>
while the one in `pu` lacks the last line. That may be the reason why
things compiled neatly before, and stopped working for you now.
So yeah, I think you are right in that the HAVE_STDINT_H guard needs to be
removed either before my patch, or squashed into it.
Ciao,
Dscho
next prev parent reply other threads:[~2017-05-12 10:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-11 13:50 [PATCH] compat/regex: fix compilation on Windows Johannes Schindelin
2017-05-11 14:30 ` Ævar Arnfjörð Bjarmason
2017-05-12 1:18 ` Junio C Hamano
2017-05-12 10:25 ` Johannes Schindelin [this message]
2017-05-12 21:02 ` Ramsay Jones
2017-05-12 21:26 ` Junio C Hamano
2017-05-12 22:27 ` Ævar Arnfjörð Bjarmason
2017-05-13 18:30 ` Johannes Schindelin
2017-05-13 19:31 ` Ævar Arnfjörð Bjarmason
2017-05-15 1:39 ` Junio C Hamano
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=alpine.DEB.2.21.1.1705121219150.146734@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).