From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Steffen Prohaska <prohaska@zib.de>,
git@vger.kernel.org, Johannes Sixt <j6t@kdbg.org>
Subject: Re: [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0
Date: Mon, 1 Jun 2009 10:57:49 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.1.00.0906011054410.26154@pacific.mpi-cbg.de> (raw)
In-Reply-To: <7vhbz0mmai.fsf@alter.siamese.dyndns.org>
Hi,
On Mon, 1 Jun 2009, Junio C Hamano wrote:
> Steffen Prohaska <prohaska@zib.de> writes:
>
> > @@ -2541,7 +2543,7 @@ struct malloc_params {
> > static struct malloc_params mparams;
> >
> > /* Ensure mparams initialized */
> > -#define ensure_initialization() (mparams.magic != 0 || init_mparams())
> > +#define ensure_initialization() if (mparams.magic == 0) init_mparams()
> >
> > #if !ONLY_MSPACES
>
> The code after the patch looks more fragile than the original. I know
> there currently is no code like:
>
> if (foo())
> ensure_initialization();
> else
> warn("oops");
>
> but this change still feels wrong.
I know, but the whole use of ensure_initialization() feels wrong to me,
and I did _not_ want to change the code too much, lest we end up
maintaining a proper fork as has happened with libxdiff.
> What issue is this patch trying to work around? Returned value not
> being used?
I forgot what the GCC warning looked like, and have only text-mode access
to the web right now, so I cannot access any Windows machine and try
again.
It was a warning, though, that much I remember.
> > diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c
> > index a381a7d..60a4093 100644
> > --- a/compat/nedmalloc/nedmalloc.c
> > +++ b/compat/nedmalloc/nedmalloc.c
> > @@ -34,7 +34,7 @@ DEALINGS IN THE SOFTWARE.
> > /*#define FULLSANITYCHECKS*/
> >
> > #include "nedmalloc.h"
> > -#if defined(WIN32) && !defined(__MINGW32__)
> > +#if defined(WIN32)
> > #include <malloc.h>
> > #endif
>
> Can somebody enlighten me what this hunk is about, and how it helps GCC
> 4.4?
It helps in that malloc.h is included even if we happen to compile the
stuff as a MinGW program. Otherwise necessary function declarations are
missing.
> There are many "#if[n]def __MINGW32__" remaining in the codebase both
> inside and outside compat/ area, so it is not that that symbol is somehow
> special. I cannot even tell which one of the following is closer to the
> reason behind this change:
>
> (1) "Because tacking '&& !defined(__MINGW32__)' after defined(WIN32) is
> unnecessary for such and such reasons, it is removed"; or
>
> (2) "Because tacking '&& !defined(__MINGW32__)' after defined(WIN32) is
> harmful for such and such reasons, it is removed".
The latter.
> Puzzled.
Hopefully less so, now.
Ciao,
Dscho
next prev parent reply other threads:[~2009-06-01 8:57 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-31 16:15 [PATCH 00/11] Various msysgit patches Steffen Prohaska
2009-05-31 16:15 ` [PATCH 01/11] MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore Steffen Prohaska
2009-05-31 16:15 ` [PATCH 02/11] Quiet make: do not leave Windows behind Steffen Prohaska
2009-05-31 16:15 ` [PATCH 03/11] Work around a regression in Windows 7, causing erase_in_line() to crash sometimes Steffen Prohaska
2009-05-31 16:15 ` [PATCH 04/11] test-chmtime: work around Windows limitation Steffen Prohaska
2009-05-31 16:15 ` [PATCH 05/11] winansi: fix compile warnings Steffen Prohaska
2009-05-31 16:15 ` [PATCH 06/11] git: browsing paths with spaces when using the start command Steffen Prohaska
2009-05-31 16:15 ` [PATCH 07/11] connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows Steffen Prohaska
2009-05-31 16:15 ` [PATCH 08/11] MinGW readdir reimplementation to support d_type Steffen Prohaska
[not found] ` <1243786525-4493-10-git-send-email-prohaska@zib.de>
2009-05-31 16:15 ` [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0 Steffen Prohaska
2009-05-31 16:15 ` [PATCH 11/11] MinGW: Teach Makefile to detect msysgit and apply specific settings Steffen Prohaska
2009-06-01 7:43 ` [PATCH 10/11] Fix warnings in nedmalloc when compiling with GCC 4.4.0 Junio C Hamano
2009-06-01 8:57 ` Johannes Schindelin [this message]
2009-06-01 16:33 ` Junio C Hamano
2009-06-01 23:38 ` GeunSik Lim
2009-06-02 12:52 ` Johannes Schindelin
2009-06-02 15:50 ` Junio C Hamano
2009-06-03 12:57 ` Johannes Schindelin
[not found] ` <7vprdl9qon.fsf@alter.siames e.dyndns.org>
2009-06-03 17:23 ` Junio C Hamano
2009-06-08 14:46 ` [PATCH 10/11 v2] " Johannes Schindelin
2009-06-08 16:50 ` Junio C Hamano
2009-06-08 18:24 ` Johannes Sixt
2009-06-09 6:06 ` Steffen Prohaska
2009-06-10 9:27 ` Johannes Sixt
2009-06-11 20:52 ` [PATCH] Fix typo in nedmalloc warning fix Johannes Sixt
2009-06-11 20:56 ` [PATCH] compat/ has subdirectories: do not omit them in 'make clean' Johannes Sixt
2009-06-11 21:13 ` [PATCH] Fix typo in nedmalloc warning fix Johannes Schindelin
2009-05-31 18:03 ` [PATCH 05/11] winansi: fix compile warnings Johannes Sixt
2009-05-31 19:52 ` Johannes Sixt
2009-06-01 6:41 ` [PATCH 05/11 v2] MinGW: fix warning about implicit declaration of _getch() Steffen Prohaska
2009-06-01 6:04 ` [PATCH 03/11 v2] Work around a regression in Windows 7, causing erase_in_line() to crash sometimes Steffen Prohaska
2009-06-01 8:25 ` Johannes Schindelin
2009-06-01 10:26 ` Steffen Prohaska
2009-06-01 10:41 ` Johannes Schindelin
2009-06-01 7:43 ` [PATCH 04/11] test-chmtime: work around Windows limitation Junio C Hamano
2009-06-01 9:00 ` Johannes Schindelin
2009-05-31 20:06 ` [PATCH 00/11] Various msysgit patches Johannes Sixt
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.1.00.0906011054410.26154@pacific.mpi-cbg.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=prohaska@zib.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).