From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/1] git-compat-util: add a test balloon for C99 support
Date: Mon, 22 Nov 2021 12:47:28 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2111221245460.63@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20211114212437.1466695-2-sandals@crustytoothpaste.net>
Hi brian,
On Sun, 14 Nov 2021, brian m. carlson wrote:
> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index fd1399c440..91e8525fa9 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt
> @@ -208,7 +208,7 @@ endif()
> if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
> set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
> set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
> - add_compile_options(/MP)
> + add_compile_options(/MP /std:c11)
> endif()
>
> #default behaviour
If we do this, we also need the following patch, to ensure that
`FLEX_ARRAY` is once again defined in a way that is acceptable for MS
Visual C:
-- snipsnap --
commit 9043470c19170643d1f74d6767a0df5d72e6c35c
Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Mon Nov 22 12:39:40 2021 +0100
fixup??? git-compat-util: add a test balloon for C99 support
This seems to be required to define `FLEX_ARRAY` in a manner that MSVC
in C11 mode accepts.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
diff --git a/git-compat-util.h b/git-compat-util.h
index cba8ad260043..fcde3588172f 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -45,7 +45,7 @@
/*
* See if our compiler is known to support flexible array members.
*/
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && (!defined(__SUNPRO_C) || (__SUNPRO_C > 0x580))
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(_MSC_VER) && (!defined(__SUNPRO_C) || (__SUNPRO_C > 0x580))
# define FLEX_ARRAY /* empty */
#elif defined(__GNUC__)
# if (__GNUC__ >= 3)
next prev parent reply other threads:[~2021-11-22 11:47 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-14 21:24 [PATCH 0/1] Add a test balloon for C99 brian m. carlson
2021-11-14 21:24 ` [PATCH 1/1] git-compat-util: add a test balloon for C99 support brian m. carlson
2021-11-15 1:14 ` Ævar Arnfjörð Bjarmason
2021-11-15 1:54 ` brian m. carlson
2021-11-15 3:16 ` Eric Sunshine
2021-11-16 1:53 ` brian m. carlson
2021-11-22 11:47 ` Johannes Schindelin [this message]
2021-11-14 21:43 ` [PATCH 0/1] Add a test balloon for C99 brian m. carlson
2021-11-15 7:00 ` Junio C Hamano
2021-11-15 22:41 ` brian m. carlson
2021-11-16 19:02 ` Junio C Hamano
2021-11-17 1:51 ` brian m. carlson
2021-11-16 2:12 ` [PATCH v2 0/1] Add a test balloon for C99 support brian m. carlson
2021-11-16 2:12 ` [PATCH v2 1/1] git-compat-util: add " brian m. carlson
2021-11-16 12:19 ` Jeff King
2021-11-16 12:54 ` Ævar Arnfjörð Bjarmason
2021-11-16 14:54 ` Jeff King
2021-11-17 2:53 ` brian m. carlson
2021-11-17 3:01 ` Jeff King
2021-11-17 23:18 ` brian m. carlson
2021-11-17 23:45 ` Carlo Arenas
2021-11-18 2:26 ` Ævar Arnfjörð Bjarmason
2021-11-18 19:10 ` Junio C Hamano
2021-11-17 8:49 ` Junio C Hamano
2021-11-16 19:44 ` Phillip Wood
2021-11-17 1:44 ` brian m. carlson
2021-11-17 2:58 ` Jeff King
2021-11-30 20:43 ` Microsoft's C language policy (was: [PATCH 0/1] Add a test balloon for C99) Ævar Arnfjörð Bjarmason
2021-11-30 22:37 ` brian m. carlson
2021-12-01 1:40 ` [PATCH v3 0/1] Add a test balloon for C99 support brian m. carlson
2021-12-01 1:40 ` [PATCH v3 1/1] git-compat-util: add " brian m. carlson
2021-12-02 17:38 ` Johannes Schindelin
[not found] <20211114211622.1465981-1-sandals@crustytoothpaste.net>
[not found] ` <20211114211622.1465981-2-sandals@crustytoothpaste.net>
2021-11-16 10:30 ` [PATCH " Johannes Schindelin
2021-11-17 8:29 ` Junio C Hamano
2021-11-22 11:44 ` Johannes Schindelin
2021-11-22 13:05 ` Ævar Arnfjörð Bjarmason
2021-11-22 17:27 ` Junio C Hamano
2021-11-22 17:52 ` Carlo Arenas
2021-11-22 18:58 ` Junio C Hamano
2021-11-22 20:52 ` 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=nycvar.QRO.7.76.6.2111221245460.63@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
/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).