Rename macro argument s_addr due to it already being defined

Signed-off-by: Peter Eriksson <pen@lysator.liu.se>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h
index aad82795691852cf7f379ed85643089948d823c4..2f1c79813464182380a06ec78331b1260c353353 100644 (file)
--- a/lib/tsocket/tsocket.h
+++ b/lib/tsocket/tsocket.h
@@ -996,16 +996,16 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
  * @return              0 on success, -1 on error with errno set.
  */
 int tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
-                                       const struct samba_sockaddr *s_addr,
+                                       const struct samba_sockaddr *xs_addr,
                                        struct tsocket_address **t_addr);
 #else
 int _tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
-                                        const struct samba_sockaddr *s_addr,
+                                        const struct samba_sockaddr *xs_addr,
                                         struct tsocket_address **t_addr,
                                         const char *location);
 
-#define tsocket_address_bsd_from_samba_sockaddr(mem_ctx, s_addr, t_addr) \
-       _tsocket_address_bsd_from_samba_sockaddr(mem_ctx, s_addr, t_addr, \
+#define tsocket_address_bsd_from_samba_sockaddr(mem_ctx, xs_addr, t_addr) \
+       _tsocket_address_bsd_from_samba_sockaddr(mem_ctx, xs_addr, t_addr, \
                                                 __location__)
 #endif
 

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 6ad40bd0ada66423ca4bef4e8f06c46ac0cda4ff..10ea13471496e12cf2a8b9fc77a6a556cf39c279 100644 (file)
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -282,13 +282,13 @@ int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx,
 }
 
 int _tsocket_address_bsd_from_samba_sockaddr(TALLOC_CTX *mem_ctx,
-                                        const struct samba_sockaddr *s_addr,
+                                        const struct samba_sockaddr *xs_addr,
                                         struct tsocket_address **t_addr,
                                         const char *location)
 {
        return _tsocket_address_bsd_from_sockaddr(mem_ctx,
-                                                 &s_addr->u.sa,
-                                                 s_addr->sa_socklen,
+                                                 &xs_addr->u.sa,
+                                                 xs_addr->sa_socklen,
                                                  t_addr,
                                                  location);
 }