From c4b76d7b19cf48ddbcbe913c22ef7f1e8429f5ea Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Wed, 18 Jul 2012 19:35:30 +0200 Subject: Rename sk_new() to avoid name collision with OpenSSL. --- sysdep/unix/io.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sysdep/unix') diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index 475d660c..f91b5278 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -588,9 +588,12 @@ static struct resclass sk_class = { * This function creates a new socket resource. If you want to use it, * you need to fill in all the required fields of the structure and * call sk_open() to do the actual opening of the socket. + * + * The real function name is sock_new(), sk_new() is a macro wrapper + * to avoid collision with OpenSSL. */ sock * -sk_new(pool *p) +sock_new(pool *p) { sock *s = ralloc(p, &sk_class); s->pool = p; -- cgit v1.2.3