diff options
| author | metze <metze@0c0555d6-39d7-0310-84fc-f1cc0bd64818> | 2007-10-24 12:57:57 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-10-25 15:52:59 +0200 |
| commit | cd486165e9825864cb73ea8b245195a4d28f1c73 (patch) | |
| tree | df963020b48c00dce97ed010afa91cd4c550f35f /source3/lib/replace/system | |
| parent | 556513ff72b2ef13654f7a5b3856f7b66a2112b7 (diff) | |
| download | samba-cd486165e9825864cb73ea8b245195a4d28f1c73.tar.gz samba-cd486165e9825864cb73ea8b245195a4d28f1c73.tar.bz2 samba-cd486165e9825864cb73ea8b245195a4d28f1c73.zip | |
[libreplace] move definition of struct addrinfo so that it can use socklen_t
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25715 0c0555d6-39d7-0310-84fc-f1cc0bd64818
(This used to be commit 45150075677451b48ce56ebdce96aca1ed13fa80)
Diffstat (limited to 'source3/lib/replace/system')
| -rw-r--r-- | source3/lib/replace/system/network.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h index 1ac881e496..774776dca3 100644 --- a/source3/lib/replace/system/network.h +++ b/source3/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 |