summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 13:45:42 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-25 13:45:42 -0700
commit2b0dda53189d3829e58187ee91143b35036573fb (patch)
tree2e6b96c1cc8ea35562ec4edaa38f0a1b05e6d4a3 /git-compat-util.h
parent402c2a7ea158eb43015e9c6a517be95c8e35192e (diff)
parent3b130ade45c70af63c7692387b65f161770a8ccc (diff)
downloadgit-2b0dda53189d3829e58187ee91143b35036573fb.tar.gz
Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1
Some sources failed to compile on systems that lack NI_MAXHOST in their system header. * dm/ni-maxhost-may-be-missing: git-compat-util.h: Provide missing netdb.h definitions
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 590d5d3188..9c01e9bc2e 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -209,6 +209,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).
*/