Browse Source

Merge branch 'dm/ni-maxhost-may-be-missing'

On systems without NI_MAXHOST in their system header files,
connect.c (hence most of the transport) did not compile.

* dm/ni-maxhost-may-be-missing:
  git-compat-util.h: Provide missing netdb.h definitions
maint
Junio C Hamano 12 years ago
parent
commit
31ccd35df4
  1. 4
      daemon.c
  2. 11
      git-compat-util.h

4
daemon.c

@ -9,10 +9,6 @@
#define HOST_NAME_MAX 256 #define HOST_NAME_MAX 256
#endif #endif


#ifndef NI_MAXSERV
#define NI_MAXSERV 32
#endif

#ifdef NO_INITGROUPS #ifdef NO_INITGROUPS
#define initgroups(x, y) (0) /* nothing */ #define initgroups(x, y) (0) /* nothing */
#endif #endif

11
git-compat-util.h

@ -213,6 +213,17 @@ extern char *gitbasename(char *);
#include <openssl/err.h> #include <openssl/err.h>
#endif #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 /* On most systems <limits.h> would have given us this, but
* not on some systems (e.g. GNU/Hurd). * not on some systems (e.g. GNU/Hurd).
*/ */

Loading…
Cancel
Save