diff options
author | Stefan Metzmacher <metze@samba.org> | 2007-10-17 14:02:33 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:14 +0100 |
commit | 9f53479997da6768113c347e4e31374328f72835 (patch) | |
tree | 02eea5096a44f09006eabb86e4ff85e40a61f61e /source4/lib/replace/getaddrinfo.h | |
parent | 1b73fcadb2ffa4c9d538c027848c8aa6ceafdb0e (diff) | |
download | samba-9f53479997da6768113c347e4e31374328f72835.tar.gz samba-9f53479997da6768113c347e4e31374328f72835.tar.bz2 samba-9f53479997da6768113c347e4e31374328f72835.zip |
r25687: Move #defined for getaddrinfo into network.h (as other
defines). Allows RHEL4 compile to work.
Jeremy.
(cherry picked from commit 0ffdf4fdeea88c21880c8bf69d8db56fb49effa7)
(This used to be commit facb811bb3c77a0b98089c283fe0707c5f486c88)
Diffstat (limited to 'source4/lib/replace/getaddrinfo.h')
-rw-r--r-- | source4/lib/replace/getaddrinfo.h | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/source4/lib/replace/getaddrinfo.h b/source4/lib/replace/getaddrinfo.h index 3e1fea8c4c..47a62eb8b2 100644 --- a/source4/lib/replace/getaddrinfo.h +++ b/source4/lib/replace/getaddrinfo.h @@ -47,86 +47,6 @@ TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. #ifndef GETADDRINFO_H #define GETADDRINFO_H - -/* Various macros that ought to be in <netdb.h>, but might not be */ - -#ifndef EAI_FAIL -#define EAI_BADFLAGS (-1) -#define EAI_NONAME (-2) -#define EAI_AGAIN (-3) -#define EAI_FAIL (-4) -#define EAI_FAMILY (-6) -#define EAI_SOCKTYPE (-7) -#define EAI_SERVICE (-8) -#define EAI_MEMORY (-10) -#define EAI_SYSTEM (-11) -#endif /* !EAI_FAIL */ - -#ifndef AI_PASSIVE -#define AI_PASSIVE 0x0001 -#endif - -#ifndef AI_NUMERICHOST -/* - * some platforms don't support AI_NUMERICHOST; define as zero if using - * the system version of getaddrinfo... - */ -#if defined(HAVE_STRUCT_ADDRINFO) && defined(HAVE_GETADDRINFO) -#define AI_NUMERICHOST 0 -#else -#define AI_NUMERICHOST 0x0004 -#endif -#endif - -#ifndef AI_ADDRCONFIG -#define AI_ADDRCONFIG 0x0020 -#endif - -#ifndef NI_NUMERICHOST -#define NI_NUMERICHOST 1 -#endif - -#ifndef NI_NUMERICSERV -#define NI_NUMERICSERV 2 -#endif - -#ifndef NI_NOFQDN -#define NI_NOFQDN 4 -#endif - -#ifndef NI_NAMEREQD -#define NI_NAMEREQD 8 -#endif - -#ifndef NI_DGRAM -#define NI_DGRAM 16 -#endif - - -#ifndef NI_MAXHOST -#define NI_MAXHOST 1025 -#endif - -#ifndef NI_MAXSERV -#define NI_MAXSERV 32 -#endif - -#ifndef HAVE_STRUCT_ADDRINFO - -struct addrinfo -{ - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - size_t ai_addrlen; - struct sockaddr *ai_addr; - char *ai_canonname; - struct addrinfo *ai_next; -}; -#endif /* HAVE_STRUCT_ADDRINFO */ - - #ifndef HAVE_GETADDRINFO /* Rename private copies per comments above */ |