diff options
| author |  Carlo Marcelo Arenas Belón <carenas@gmail.com> | 2019-07-28 13:07:22 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-28 21:51:19 -0700 |
| commit | 0d0e1e85aad517e46bcb341cd7081395de9c6dee (patch) | |
| tree | 5286715500808a12f8a31b470972c9a50b1d702a /Documentation/git-sh-i18n--envsubst.txt | |
| parent | wt-status.h: drop stdio.h include (diff) | |
| download | tgif-0d0e1e85aad517e46bcb341cd7081395de9c6dee.tar.xz | |
xdiff: drop system includes in xutils.c
After b46054b374 ("xdiff: use git-compat-util", 2019-04-11), two system
headers added with 6942efcfa9 ("xdiff: load full words in the inner loop
of xdl_hash_record", 2012-04-06) to xutils.c are no longer needed and
could conflict as shown below from an OpenIndiana build:
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-sh-i18n--envsubst.txt')
0 files changed, 0 insertions, 0 deletions