git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: peff@peff.net
Subject: [PATCH] xdiff: avoid accidental redefinition of LFS feature in OpenIndiana
Date: Mon, 17 Jun 2019 23:45:37 -0700	[thread overview]
Message-ID: <20190618064537.62369-1-carenas@gmail.com> (raw)

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)

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
 xdiff/xutils.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 963e1c58b9..cfa6e2220f 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -20,13 +20,9 @@
  *
  */
 
-#include <limits.h>
-#include <assert.h>
 #include "xinclude.h"
 
 
-
-
 long xdl_bogosqrt(long n) {
 	long i;
 
-- 
2.22.0


             reply	other threads:[~2019-06-18  6:45 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-18  6:45 Carlo Marcelo Arenas Belón [this message]
2019-06-18 14:43 ` [PATCH] xdiff: avoid accidental redefinition of LFS feature in OpenIndiana Johannes Schindelin
2019-06-18 15:53 ` [PATCH 0/2] a few more redundant system include cleanups Jeff King
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

  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=20190618064537.62369-1-carenas@gmail.com \
    --to=carenas@gmail.com \
    --cc=git@vger.kernel.org \
    --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.
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).