Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint

diff --git a/git-compat-util.h b/git-compat-util.h
index b636e0dd0c2ea8284ed6f34e32c448eae433a20a..e715285e7c2e0a3d0b959505921b344dda55089d 100644 (file)
--- 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).
  */