From: "Torsten Bögershausen" <tboegi@web.de>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] compat/mingw: brown paper bag fix for 50a6c8e
Date: Mon, 29 Feb 2016 10:56:22 +0100 [thread overview]
Message-ID: <56D415C6.2040203@web.de> (raw)
In-Reply-To: <20160229092816.GA23910@sigill.intra.peff.net>
Thanks for the fast-patch.
I manually copied the patch, But there are more probles, it seems.
$ git diff
diff --git a/compat/mingw.c b/compat/mingw.c
index cfedcf9..b1163f2 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1069,7 +1069,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char
**argv, char **deltaen
free(quoted);
}
- wargs = xmalloc_array(st_add(st_mult(2, args.len), 1), sizeof(wchar_t));
+ wargs = ALLOC_ARRAY(st_add(st_mult(2, args.len), 1), sizeof(wchar_t));
xutftowcs(wargs, args.buf, 2 * args.len + 1);
strbuf_release(&args);
tb@torbogwm MINGW64 ~/Users/tb/projects/git/tb ((2273582...))
$ make
CC compat/mingw.o
In file included from compat/mingw.c:1:0:
compat/mingw.c: In function 'mingw_spawnve_fd':
compat/../git-compat-util.h:769:60: error: invalid type argument of unary '*'
(have 'size_t {aka long long unsigned int}')
#define ALLOC_ARRAY(x, alloc) (x) = xmalloc(st_mult(sizeof(*(x)), (alloc)))
^
compat/mingw.c:1072:10: note: in expansion of macro 'ALLOC_ARRAY'
wargs = ALLOC_ARRAY(st_add(st_mult(2, args.len), 1), sizeof(wchar_t));
^
Makefile:1948: recipe for target 'compat/mingw.o' failed
make: *** [compat/mingw.o] Error 1
next prev parent reply other threads:[~2016-02-29 9:56 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 6:30 50a6c8ef - xmalloc_array Torsten Bögershausen
2016-02-29 9:28 ` [PATCH] compat/mingw: brown paper bag fix for 50a6c8e Jeff King
2016-02-29 9:56 ` Torsten Bögershausen [this message]
2016-02-29 10:02 ` Jeff King
2016-02-29 10:40 ` Compiler warning under cygwin/mingw (was: fix for 50a6c8e) Torsten Bögershausen
2016-02-29 10:47 ` Jeff King
2016-02-29 14:05 ` SZEDER Gábor
2016-04-12 23:20 ` Compiler warning under cygwin/mingw Junio C Hamano
2016-05-10 18:29 ` [PATCH 0/6] modernize t1500 Junio C Hamano
2016-02-29 12:32 ` Compiler warning under cygwin/mingw Ramsay Jones
2016-03-03 3:33 ` Ramsay Jones
2016-03-03 5:25 ` Ramsay Jones
2016-02-29 19:10 ` [PATCH] compat/mingw: brown paper bag fix for 50a6c8e Junio C Hamano
2016-02-29 21:36 ` Jeff King
2016-03-01 5:49 ` Torsten Bögershausen
2016-03-01 5:54 ` Jeff King
2016-03-01 13:52 ` Johannes Schindelin
2016-02-29 13:01 ` Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2016-05-10 5:20 [PATCH 0/6] modernize t1500 Eric Sunshine
2016-05-10 5:20 ` [PATCH 1/6] t1500: test_rev_parse: facilitate future test enhancements Eric Sunshine
2016-05-10 5:20 ` [PATCH 2/6] t1500: reduce dependence upon global state Eric Sunshine
2016-05-10 5:20 ` [PATCH 3/6] t1500: avoid changing working directory outside of tests Eric Sunshine
2016-05-10 5:20 ` [PATCH 4/6] t1500: avoid setting configuration options " Eric Sunshine
2016-05-10 6:34 ` Eric Sunshine
2016-05-10 18:02 ` Junio C Hamano
2016-05-10 5:20 ` [PATCH 5/6] t1500: avoid setting environment variables " Eric Sunshine
2016-05-10 18:39 ` Jeff King
2016-05-10 19:12 ` Eric Sunshine
2016-05-10 19:19 ` Junio C Hamano
2016-05-10 19:48 ` Eric Sunshine
2016-05-10 19:59 ` Eric Sunshine
2016-05-10 20:41 ` Jeff King
2016-05-10 20:07 ` Junio C Hamano
2016-05-10 21:01 ` SZEDER Gábor
2016-05-10 21:11 ` Junio C Hamano
2016-05-10 21:19 ` Eric Sunshine
2016-05-10 5:20 ` [PATCH 6/6] t1500: be considerate to future potential tests Eric Sunshine
2016-05-10 6:07 ` [PATCH 0/6] modernize t1500 Junio C Hamano
2016-05-10 18:10 ` Junio C Hamano
2016-05-10 18:26 ` Junio C Hamano
2016-05-16 17:39 ` Eric Sunshine
2016-05-16 18: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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56D415C6.2040203@web.de \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.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.
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 NNTP newsgroup(s).