summaryrefslogtreecommitdiff
path: root/sysdep
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2012-07-18 19:35:30 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2012-07-18 19:35:30 +0200
commitc4b76d7b19cf48ddbcbe913c22ef7f1e8429f5ea (patch)
treecfc222e01dd6d2727144f1fc86441dc65826214f /sysdep
parent4be266a9831799dcc2e67e83fc83d9db43828a64 (diff)
Rename sk_new() to avoid name collision with OpenSSL.
Diffstat (limited to 'sysdep')
-rw-r--r--sysdep/unix/io.c5
1 files changed, 4 insertions, 1 deletions
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;