diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:46:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:46:42 -0700 |
commit | f7b1ad870c46c53685ef83efbfd7d9ca1983a191 (patch) | |
tree | 3d37b13993699ccd8f1bebc1b4b93546da3e9bda /git-compat-util.h | |
parent | 04fe1184fd0611bf26785b365dd344b8f7d72861 (diff) | |
parent | 7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4 (diff) | |
download | git-f7b1ad870c46c53685ef83efbfd7d9ca1983a191.tar.gz |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
bundle: Add colons to list headings in "verify"
bundle: Fix "verify" output if history is complete
Documentation: filter-branch env-filter example
git-filter-branch.txt: clarify ident variables usage
git-compat-util.h: Provide missing netdb.h definitions
describe: Document --match pattern format
Documentation/githooks: Explain pre-rebase parameters
update-index: list supported idx versions and their features
diff-options: unconfuse description of --color
read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
index-format.txt: mention of v4 is missing in some places
Diffstat (limited to 'git-compat-util.h')
-rw-r--r-- | git-compat-util.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index b636e0dd0c..e715285e7c 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -213,6 +213,17 @@ extern char *gitbasename(char *); #include <openssl/err.h> #endif +/* On most systems <netdb.h> would have given us this, but + * not on some systems (e.g. z/OS). + */ +#ifndef NI_MAXHOST +#define NI_MAXHOST 1025 +#endif + +#ifndef NI_MAXSERV +#define NI_MAXSERV 32 +#endif + /* On most systems <limits.h> would have given us this, but * not on some systems (e.g. GNU/Hurd). */ |