aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorGary V. Vaughan <git@mlists.thewrittenword.com>2010-05-14 09:31:43 +0000
committerJunio C Hamano <gitster@pobox.com>2010-05-31 17:36:27 -0700
commitf9f33cdc78b5893a4764b1437b59536f399a50d1 (patch)
treecd509cc43dcd284861f820c62ffa6395d9aaa2e6 /merge-recursive.c
parente88a135bc55a974ea04576ccc014c5e2bdc4b892 (diff)
downloadgit-f9f33cdc78b5893a4764b1437b59536f399a50d1.tar.gz
git-f9f33cdc78b5893a4764b1437b59536f399a50d1.tar.xz
Allow disabling "inline"
Compiler support for inline is sometimes buggy, and occasionally missing entirely. This patch adds a test for inline support, and redefines the keyword with the preprocessor if necessary at compile time. Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions