diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-08-27 11:42:05 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-08-27 13:00:26 +0200 |
| commit | 44b2a7941c1da4c565cb14bae7acc355787ecc6e (patch) | |
| tree | 069e627963275c54842ca3a665a0c95c2c87b6aa /lib/tsocket/tsocket.h | |
| parent | 8e1d3b5f8fe4b5bbb61a357e9db62adad7d767f1 (diff) | |
| download | samba-44b2a7941c1da4c565cb14bae7acc355787ecc6e.tar.gz samba-44b2a7941c1da4c565cb14bae7acc355787ecc6e.tar.bz2 samba-44b2a7941c1da4c565cb14bae7acc355787ecc6e.zip | |
lib/tsocket: sa_socklen is a macro on irix, so better use sasocklen
metze
Diffstat (limited to 'lib/tsocket/tsocket.h')
| -rw-r--r-- | lib/tsocket/tsocket.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h index 3dd96664ea..fb76fe5d8f 100644 --- a/lib/tsocket/tsocket.h +++ b/lib/tsocket/tsocket.h @@ -843,7 +843,7 @@ struct sockaddr; * * @param[in] sa The sockaddr structure to convert. * - * @param[in] sa_socklen The lenth of the sockaddr sturucte. + * @param[in] sasocklen The lenth of the sockaddr sturucte. * * @param[out] addr The tsocket pointer to allocate and fill. * @@ -851,17 +851,17 @@ struct sockaddr; */ int tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx, struct sockaddr *sa, - size_t sa_socklen, + size_t sasocklen, struct tsocket_address **addr); #else int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx, struct sockaddr *sa, - size_t sa_socklen, + size_t sasocklen, struct tsocket_address **_addr, const char *location); -#define tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sa_socklen, _addr) \ - _tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sa_socklen, _addr, \ +#define tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sasocklen, _addr) \ + _tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sasocklen, _addr, \ __location__) #endif @@ -872,10 +872,10 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx, * * @param[in] sa The bsd sockaddr structure to fill out. * - * @param[in] sa_socklen The length of the bsd sockaddr structure to fill out. + * @param[in] sasocklen The length of the bsd sockaddr structure to fill out. * * @return The actual size of the sockaddr structure, -1 on error - * with errno set. The size could differ from sa_socklen. + * with errno set. The size could differ from sasocklen. * * @code * ssize_t socklen; @@ -891,7 +891,7 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx, */ ssize_t tsocket_address_bsd_sockaddr(const struct tsocket_address *addr, struct sockaddr *sa, - size_t sa_socklen); + size_t sasocklen); #ifdef DOXYGEN /** |