Merge branch 'gv/portable'
commit8d676d85f772ce3a100b6f0dddd1c34a7e4313cf
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:44 +0000 (21 06:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:44 +0000 (21 06:02 -0700)
treeb6fa143842fc72a3bb2079dfdb66f30ce5126319
parent919e06b2288270f47c55759e8810b87f74609caf
parent5e87eae97df69a48a575fd79131e85067f9dbf13
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
34 files changed:
Makefile
builtin/apply.c
builtin/blame.c
builtin/checkout.c
builtin/commit.c
builtin/receive-pack.c
builtin/remote.c
cache.h
commit.h
config.mak.in
configure.ac
connect.c
convert.c
diff.h
dir.c
fast-import.c
git-compat-util.h
grep.h
http-walker.c
merge-recursive.h
pretty.c
refs.c
remote.c
t/Makefile
t/lib-t6000.sh
t/t0000-basic.sh
t/t3200-branch.sh
t/t3903-stash.sh
t/t4124-apply-ws-rule.sh
t/t9400-git-cvsserver-server.sh
t/test-lib.sh
unpack-trees.c
wt-status.c
wt-status.h