summaryrefslogtreecommitdiffstats
path: root/crypto/bio/bio_lcl.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-16 10:27:16 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-16 17:16:32 +0100
commit29620124ff1624af5411d8d2998fdd7b102a5d48 (patch)
treef9602eef29deaa3d0dfe82ca487167a5f7a7ccce /crypto/bio/bio_lcl.h
parent432c7a50f2544c84bd367b9ce9ef6d5cbeea62ff (diff)
On solaris, the variable name sun clashes, use s_un instead
For orthogonality, we change sin -> s_in and sin6 -> s_in6 as well. Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/bio/bio_lcl.h')
-rw-r--r--crypto/bio/bio_lcl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_lcl.h
index eb9d463665..24f8b18595 100644
--- a/crypto/bio/bio_lcl.h
+++ b/crypto/bio/bio_lcl.h
@@ -53,11 +53,11 @@ struct bio_addrinfo_st {
union bio_addr_st {
struct sockaddr sa;
# ifdef AF_INET6
- struct sockaddr_in6 sin6;
+ struct sockaddr_in6 s_in6;
# endif
- struct sockaddr_in sin;
+ struct sockaddr_in s_in;
# ifdef AF_UNIX
- struct sockaddr_un sun;
+ struct sockaddr_un s_un;
# endif
};
#endif