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

diff --git a/daemon.c b/daemon.c
index 4602b46a5c39e1d501143ab4e95b55aff5c8f23b..df8c0ab0588e70ad6e6f56195535030055782d85 100644 (file)
--- 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 590d5d3188aed8f3a2b0b7050f2502b28cb4f5fa..9c01e9bc2eaaa9fe302228263bcc0e1e5e9196f8 100644 (file)
--- 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).
  */