diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-10-24 12:57:57 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:25 +0100 |
| commit | 582496f5d0e13e514e9c7cb02b138e730b8377d0 (patch) | |
| tree | 944943f63c075bad7592fef784766465c11e0a3a /source4 | |
| parent | c01f61340bb1792d08e649708124f07ec19cc23d (diff) | |
| download | samba-582496f5d0e13e514e9c7cb02b138e730b8377d0.tar.gz samba-582496f5d0e13e514e9c7cb02b138e730b8377d0.tar.bz2 samba-582496f5d0e13e514e9c7cb02b138e730b8377d0.zip | |
r25715: [libreplace] move definition of struct addrinfo so that it can use socklen_t
metze
(This used to be commit 12cec014c465a55974aedf44e0e782f5fb841088)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/replace/system/network.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/source4/lib/replace/system/network.h b/source4/lib/replace/system/network.h index 1ac881e496..774776dca3 100644 --- a/source4/lib/replace/system/network.h +++ b/source4/lib/replace/system/network.h @@ -169,21 +169,6 @@ const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); #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 */ - /* * glibc on linux doesn't seem to have MSG_WAITALL * defined. I think the kernel has it though.. @@ -234,6 +219,19 @@ typedef unsigned short int sa_family_t; #endif #endif +#ifndef HAVE_STRUCT_ADDRINFO +struct addrinfo { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + socklen_t ai_addrlen; + struct sockaddr *ai_addr; + char *ai_canonname; + struct addrinfo *ai_next; +}; +#endif /* HAVE_STRUCT_ADDRINFO */ + #ifdef SOCKET_WRAPPER #ifndef SOCKET_WRAPPER_NOT_REPLACE #define SOCKET_WRAPPER_REPLACE |