summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar David Michael <fedora.dm0@gmail.com>2013-02-25 14:30:19 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 12:16:08 -0800
commit3b130ade45c70af63c7692387b65f161770a8ccc (patch)
treeab65009003069f5c27e33c92e1d9c10931c27390
parentGit 1.7.12.4 (diff)
downloadtgif-3b130ade45c70af63c7692387b65f161770a8ccc.tar.xz
git-compat-util.h: Provide missing netdb.h definitions
Some platforms may lack the NI_MAXHOST and NI_MAXSERV values in their system headers, so ensure they are available. Signed-off-by: David Michael <fedora.dm0@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--daemon.c4
-rw-r--r--git-compat-util.h11
2 files changed, 11 insertions, 4 deletions
diff --git a/daemon.c b/daemon.c
index ab21e66b2f..34d95c1674 100644
--- a/daemon.c
+++ b/daemon.c
@@ -9,10 +9,6 @@
#define HOST_NAME_MAX 256
#endif
-#ifndef NI_MAXSERV
-#define NI_MAXSERV 32
-#endif
-
#ifdef NO_INITGROUPS
#define initgroups(x, y) (0) /* nothing */
#endif
diff --git a/git-compat-util.h b/git-compat-util.h
index 000042d793..503282c863 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -178,6 +178,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).
*/