diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:45:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:45:42 -0700 |
| commit | 2b0dda53189d3829e58187ee91143b35036573fb (patch) | |
| tree | 2e6b96c1cc8ea35562ec4edaa38f0a1b05e6d4a3 | |
| parent | 402c2a7ea158eb43015e9c6a517be95c8e35192e (diff) | |
| parent | 3b130ade45c70af63c7692387b65f161770a8ccc (diff) | |
| download | git-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
| -rw-r--r-- | daemon.c | 4 | ||||
| -rw-r--r-- | git-compat-util.h | 11 |
2 files changed, 11 insertions, 4 deletions
@@ -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 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). */ |