Skip to content

Commit

Permalink
Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Mar 25, 2013
2 parents 402c2a7 + 3b130ad commit 2b0dda5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
4 changes: 0 additions & 4 deletions daemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions git-compat-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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).
*/
Expand Down

0 comments on commit 2b0dda5

Please sign in to comment.