| Message ID | 20190618064537.62369-1-carenas@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xdiff: avoid accidental redefinition of LFS feature in OpenIndiana | expand |
Hi Carlo, in the Git ecosystem, the abbreviation "LFS" does not mean what you think it means... Let's not use the abbreviation for anything else. On Mon, 17 Jun 2019, 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 s/where/are/ Otherwise the patch looks fine to me, thanks, Johannes > 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 > >
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;
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(-)