diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-21 17:37:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-21 17:37:54 -0700 |
| commit | 7b8e4ab07c6ebc72e311804c9c79ef93cfbbe704 (patch) | |
| tree | 6cd08641883391adac6e12352017eb544df0f7e8 /Makefile | |
| parent | Merge branch 'js/fmt-patch' into next (diff) | |
| parent | mailinfo: skip bogus UNIX From line inside body (diff) | |
| download | tgif-7b8e4ab07c6ebc72e311804c9c79ef93cfbbe704.tar.xz | |
Merge branch 'jc/mailinfo' into next
* jc/mailinfo:
mailinfo: skip bogus UNIX From line inside body
tutorial-2: typofix in examples.
tutorial: add discussion of index file, object database
tutorial: expanded discussion of commit history
tutorial: replace "whatchanged" by "log"
NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
remove superflous "const"
checkdiff_consume: strtol parameter fix.
Elaborate on why ':' is a bad idea in a ref name.
Reference git-check-ref-format in git-branch.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -421,6 +421,9 @@ else ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in6 endif endif +ifdef NO_INET_NTOP + LIB_OBJS += compat/inet_ntop.o +endif ifdef NO_ICONV ALL_CFLAGS += -DNO_ICONV |