On 2013-08-19 08.38, Steffen Prohaska wrote: [snip] > diff --git a/builtin/var.c b/builtin/var.c > index aedbb53..e59f5ba 100644 > --- a/builtin/var.c > +++ b/builtin/var.c > @@ -38,6 +38,7 @@ static struct git_var git_vars[] = { > { "", NULL }, > }; > > +#undef read This is techically right for this very version of the code, but not really future proof, if someone uses read() further down in the code (in a later version) I think the problem comes from further up: ------------------ struct git_var { const char *name; const char *(*read)(int); }; ----------------- could the read be replaced by readfn ? =================== > diff --git a/streaming.c b/streaming.c > index debe904..c1fe34a 100644 > --- a/streaming.c > +++ b/streaming.c > @@ -99,6 +99,7 @@ int close_istream(struct git_istream *st) > return r; > } > > +#undef read Same possible future problem as above. When later someone uses read, the original (buggy) read() will be used, and not the re-defined clipped_read() from git-compat-util.h -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html