[09/17] msvc: mark a variable as non-const

Message ID	e813075ade89380848bc7a9cb711cb52642ae4d5.1560860634.git.gitgitgadget@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Date: Tue, 18 Jun 2019 05:24:01 -0700 (PDT) Message-Id: <e813075ade89380848bc7a9cb711cb52642ae4d5.1560860634.git.gitgitgadget@gmail.com> In-Reply-To: <pull.149.git.gitgitgadget@gmail.com> References: <pull.149.git.gitgitgadget@gmail.com> From: "Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> Subject: [PATCH 09/17] msvc: mark a variable as non-const Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Jeff Hostetler <jeffhost@microsoft.com> Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Fix MSVC support, at long last \| expand [00/17] Fix MSVC support, at long last [02/17] t0001 (mingw): do not expect a specific order of stdout/stderr [03/17] cache-tree.c: avoid reusing the DEBUG constant [04/17] obstack: fix compiler warning [05/17] mingw: replace mingw_startup() hack [06/17] msvc: fix dependencies of compat/msvc.c [07/17] msvc: include sigset_t definition [08/17] msvc: define O_ACCMODE [09/17] msvc: mark a variable as non-const [10/17] msvc: do not re-declare the timespec struct [11/17] msvc: define ftello() [12/17] msvc: fix detect_msys_tty() [13/17] msvc: support building Git using MS Visual C++ [14/17] msvc: add pragmas for common warnings [15/17] msvc: do not pretend to support all signals [16/17] msvc: avoid debug assertion windows in Debug Mode [17/17] msvc: ignore .dll and incremental compile output

Message ID

e813075ade89380848bc7a9cb711cb52642ae4d5.1560860634.git.gitgitgadget@gmail.com (mailing list archive)

State

New, archived

Headers

Date: Tue, 18 Jun 2019 05:24:01 -0700 (PDT)
Message-Id: 
 <e813075ade89380848bc7a9cb711cb52642ae4d5.1560860634.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.149.git.gitgitgadget@gmail.com>
References: <pull.149.git.gitgitgadget@gmail.com>
From: "Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com>
Subject: [PATCH 09/17] msvc: mark a variable as non-const
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
        Jeff Hostetler <jeffhost@microsoft.com>
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

Fix MSVC support, at long last | expand

Commit Message

Linus Arver via GitGitGadget June 18, 2019, 12:24 p.m. UTC

From: Jeff Hostetler <jeffhost@microsoft.com>

VS2015 complains when using a const pointer in memcpy()/free().

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 compat/mingw.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 0d8713e515..d14d33308d 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1553,7 +1553,10 @@  static int try_shell_exec(const char *cmd, char *const *argv)
 	if (prog) {
 		int exec_id;
 		int argc = 0;
-		const char **argv2;
+#ifndef _MSC_VER
+		const
+#endif
+		char **argv2;
 		while (argv[argc]) argc++;
 		ALLOC_ARRAY(argv2, argc + 1);
 		argv2[0] = (char *)cmd;	/* full path to the script file */

[09/17] msvc: mark a variable as non-const

Commit Message

Patch