From: Junio C Hamano <gitster@pobox.com>
To: Sven Strickroth <sven@cs-ware.de>
Cc: Git List <git@vger.kernel.org>,
Sebastian Schuberth <sschuberth@gmail.com>,
blees@dcon.de
Subject: Re: [PATCH 2/2] MSVC: VS2013 comes with inttypes.h
Date: Tue, 29 Mar 2016 09:47:05 -0700 [thread overview]
Message-ID: <xmqqegatz0xi.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <56FAACD4.9080504@cs-ware.de> (Sven Strickroth's message of "Tue, 29 Mar 2016 18:27:00 +0200")
Sven Strickroth <sven@cs-ware.de> writes:
> Reduce the number of defines which need to be managed within vanilal git.
Hmph.
>
> Signed-off-by: Sven Strickroth <sven@cs-ware.de>
> ---
I am not qualified to judge the correctness of the assertions this
change makes:
* MSVC at or newer than version 1800 have PRIuMAX and PRId64
* MSVC at or newer than version 1800 have {UINT,INT}MAX_{MIN,MAX}
and will wait for Windows folks to Ack.
Thanks.
> compat/mingw.h | 2 +-
> compat/vcbuild/include/unistd.h | 2 ++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/compat/mingw.h b/compat/mingw.h
> index 6b6d695..5d7f0dd 100644
> --- a/compat/mingw.h
> +++ b/compat/mingw.h
> @@ -415,7 +415,7 @@ int mingw_offset_1st_component(const char *path);
> extern void build_libgit_environment(void);
> extern const char *program_data_config(void);
> #define git_program_data_config program_data_config
> -#ifndef __MINGW64_VERSION_MAJOR
> +#if !defined(__MINGW64_VERSION_MAJOR) || !defined(_MSC_VER) || _MSC_VER < 1800
> #define PRIuMAX "I64u"
> #define PRId64 "I64d"
> #else
> diff --git a/compat/vcbuild/include/unistd.h b/compat/vcbuild/include/unistd.h
> index c65c2cd..b4b7b7c 100644
> --- a/compat/vcbuild/include/unistd.h
> +++ b/compat/vcbuild/include/unistd.h
> @@ -45,11 +45,13 @@ typedef unsigned long long uintmax_t;
>
> typedef int64_t off64_t;
>
> +#if !defined(_MSC_VER) || _MSC_VER < 1800
> #define INTMAX_MIN _I64_MIN
> #define INTMAX_MAX _I64_MAX
> #define UINTMAX_MAX _UI64_MAX
>
> #define UINT32_MAX 0xffffffff /* 4294967295U */
> +#endif
>
> #define STDIN_FILENO 0
> #define STDOUT_FILENO 1
next prev parent reply other threads:[~2016-03-29 16:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-29 16:27 [PATCH 2/2] MSVC: VS2013 comes with inttypes.h Sven Strickroth
2016-03-29 16:47 ` Junio C Hamano [this message]
2016-03-29 17:23 ` [PATCH 2/2 V2] " Sven Strickroth
2016-03-29 17:35 ` Junio C Hamano
2016-03-30 8:52 ` Sebastian Schuberth
2016-03-30 11:37 ` [PATCH 2/2 V3] MSVC: Use shipped headers instead of fallback definitions Sven Strickroth
2016-03-30 11:40 ` Sebastian Schuberth
2016-03-30 11:42 ` Johannes Schindelin
2016-03-30 18:19 ` 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=xmqqegatz0xi.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=blees@dcon.de \
--cc=git@vger.kernel.org \
--cc=sschuberth@gmail.com \
--cc=sven@cs-ware.de \
/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).