git/git-compat-util.h, branch v1.7.2

Merge branch 'js/async-thread'

2010-06-21T13:02:45Z

* js/async-thread: fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f) Enable threaded async procedures whenever pthreads is available Dying in an async procedure should only exit the thread, not the process. Reimplement async procedures using pthreads Windows: more pthreads functions Fix signature of fcntl() compatibility dummy Make report() from usage.c public as vreportf() and use it. Modernize t5530-upload-pack-error. Conflicts: http-backend.c

Merge branch 'gv/portable'

2010-06-21T13:02:44Z

* 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

Merge branch 'js/try-to-free-stackable'

2010-06-13T18:21:21Z

* js/try-to-free-stackable: Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used Have set_try_to_free_routine return the previous routine

Merge branch 'maint'

2010-06-02T17:17:26Z

* maint: git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX Documentation: A...B shortcut for checkout and rebase Documentation/pretty-{formats,options}: better reference for "format:"

git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX

2010-06-02T17:03:53Z

IRIX 6.5.26m does not define the 'sgi' macro, but it does define an '__sgi' macro. Since later IRIX versions (6.5.29m) define both macros, and since an underscore prefixed macro is preferred anyway, use '__sgi' to detect compilation on SGI IRIX. Signed-off-by: Brandon Casey Signed-off-by: Gary V. Vaughan Signed-off-by: Junio C Hamano

git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition

2010-06-01T00:36:27Z

Some platforms with mmap() lack MAP_FAILED definition. Signed-off-by: Gary V. Vaughan Signed-off-by: Junio C Hamano

Merge branch 'cw/maint-exec-defpath'

2010-05-21T11:02:17Z

* cw/maint-exec-defpath: autoconf: Check if exists and set HAVE_PATHS_H exec_cmd.c: replace hard-coded path list with one from

Merge branch 'np/malloc-threading'

2010-05-21T11:02:16Z

* np/malloc-threading: Thread-safe xmalloc and xrealloc needs a recursive mutex Make xmalloc and xrealloc thread-safe

Merge branch 'pc/remove-warn'

2010-05-09T05:32:59Z

* pc/remove-warn: Remove a redundant errno test in a usage of remove_path Introduce remove_or_warn function Implement the rmdir_or_warn function Generalise the unlink_or_warn function

Have set_try_to_free_routine return the previous routine

2010-05-09T05:27:54Z

This effectively requires from the callers of set_try_to_free_routine to treat the try-to-free-routines as a stack. We will need this for the next patch where the only current caller cannot depend on that the previously set routine was the default routine. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano