Skip to content

Commit 0d0e1e8

Browse files
carenasgitster
authored andcommitted
xdiff: drop system includes in xutils.c
After b46054b ("xdiff: use git-compat-util", 2019-04-11), two system headers added with 6942efc ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7a06fb0 commit 0d0e1e8

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

xdiff/xutils.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,9 @@
2020
*
2121
*/
2222

23-
#include <limits.h>
24-
#include <assert.h>
2523
#include "xinclude.h"
2624

2725

28-
29-
3026
long xdl_bogosqrt(long n) {
3127
long i;
3228

0 commit comments

Comments
 (0)