From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Sep 2013 21:40:18 +0000 (-0700)
Subject: Merge branch 'hv/config-from-blob' into maint
X-Git-Tag: v1.8.4.1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bda790474690a5e5e9963221dc0d5b66fbf01875;p=thirdparty%2Fgit.git

Merge branch 'hv/config-from-blob' into maint

Compilation fix on platforms with fgetc() and friends defined as
macros.

* hv/config-from-blob:
  config: do not use C function names as struct members
---

bda790474690a5e5e9963221dc0d5b66fbf01875