From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 13:02:44 +0000 (-0700)
Subject: Merge branch 'gv/portable'
X-Git-Tag: v1.7.2-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8d676d85f772ce3a100b6f0dddd1c34a7e4313cf?hp=8d676d85f772ce3a100b6f0dddd1c34a7e4313cf

Merge branch 'gv/portable'

* gv/portable:
test-lib: use DIFF definition from GIT-BUILD-OPTIONS
build: propagate $DIFF to scripts
Makefile: Tru64 portability fix
Makefile: HP-UX 10.20 portability fixes
Makefile: HPUX11 portability fixes
Makefile: SunOS 5.6 portability fix
inline declaration does not work on AIX
Allow disabling "inline"
Some platforms lack socklen_t type
Make NO_{INET_NTOP,INET_PTON} configured independently
Makefile: some platforms do not have hstrerror anywhere
git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
test_cmp: do not use "diff -u" on platforms that lack one
fixup: do not unconditionally disable "diff -u"
tests: use "test_cmp", not "diff", when verifying the result
Do not use "diff" found on PATH while building and installing
enums: omit trailing comma for portability
Makefile: -lpthread may still be necessary when libc has only pthread stubs
Rewrite dynamic structure initializations to runtime assignment
Makefile: pass CPPFLAGS through to fllow customization

Conflicts:
Makefile
wt-status.h
---