All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH 0/2] a few more redundant system include cleanups
Date: Tue, 18 Jun 2019 11:53:26 -0400	[thread overview]
Message-ID: <20190618155326.GA4014@sigill.intra.peff.net> (raw)
In-Reply-To: <20190618064537.62369-1-carenas@gmail.com>

On Mon, Jun 17, 2019 at 11:45:37PM -0700, Carlo Marcelo Arenas Belón wrote:

> after b46054b374 ("xdiff: use git-compat-util", 2019-04-11), two system
> headers added in 2012 to xutils where no longer needed and could conflict
> as shown below:
> 
> In file included from xdiff/xinclude.h:26:0,
>                  from xdiff/xutils.c:25:
> ./git-compat-util.h:4:0: warning: "_FILE_OFFSET_BITS" redefined
>  #define _FILE_OFFSET_BITS 64
> 
> In file included from /usr/include/limits.h:37:0,
>                  from xdiff/xutils.c:23:
> /usr/include/sys/feature_tests.h:231:0: note: this is the location of the previous definition
>  #define _FILE_OFFSET_BITS 32
> 
> make sure git-compat-util.h is the first header (through xinclude.h)

Thanks, this looks good to me. I fixed the system headers in xinclude.h,
but didn't think to check for individual C files including them.

I did a quick grep for similar cases, and didn't find any that I think
would be problematic. There were a few cleanups, below.

There are still some other system includes, but they are mostly one-offs
that we wouldn't expect git-compat-util to cover (e.g., threading stuff
in thread-utils.[ch], openssl stuff in hash.h). So I think with your
patch, plus the patches below, there's nothing left to clean up.

  [1/2]: verify-tag: drop signal.h include
  [2/2]: wt-status.h: drop stdio.h include

 builtin/verify-commit.c | 1 -
 builtin/verify-tag.c    | 1 -
 wt-status.h             | 1 -
 3 files changed, 3 deletions(-)

-Peff

  parent reply	other threads:[~2019-06-18 15:53 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-18  6:45 [PATCH] xdiff: avoid accidental redefinition of LFS feature in OpenIndiana Carlo Marcelo Arenas Belón
2019-06-18 14:43 ` Johannes Schindelin
2019-06-18 15:53 ` Jeff King [this message]
2019-06-18 15:54   ` [PATCH 1/2] verify-tag: drop signal.h include Jeff King
2019-06-18 15:54   ` [PATCH 2/2] wt-status.h: drop stdio.h include Jeff King
2019-06-19  9:12   ` [PATCH 0/2] a few more redundant system include cleanups Carlo Arenas
2019-06-19 17:48     ` Jeff King
2019-07-03 18:49       ` Junio C Hamano
2019-07-04  5:11         ` Carlo Arenas
2019-07-28 20:07           ` [PATCH v2 0/5] system header cleanup Carlo Marcelo Arenas Belón
2019-07-28 20:07             ` [PATCH v2 1/5] verify-tag: drop signal.h include Carlo Marcelo Arenas Belón
2019-07-28 20:07             ` [PATCH v2 2/5] wt-status.h: drop stdio.h include Carlo Marcelo Arenas Belón
2019-07-28 20:07             ` [PATCH v2 3/5] xdiff: drop system includes in xutils.c Carlo Marcelo Arenas Belón
2019-07-28 20:07             ` [PATCH v2 4/5] xdiff: remove duplicate headers from xhistogram.c Carlo Marcelo Arenas Belón
2019-07-28 20:07             ` [PATCH v2 5/5] xdiff: remove duplicate headers from xpatience.c Carlo Marcelo Arenas Belón
2019-07-28 22:19             ` [PATCH v2 0/5] system header cleanup Jeff King
2019-07-29  4:54               ` 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=20190618155326.GA4014@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=carenas@gmail.com \
    --cc=git@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.