summaryrefslogtreecommitdiff
path: root/lib
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 /lib
parent4be266a9831799dcc2e67e83fc83d9db43828a64 (diff)
Rename sk_new() to avoid name collision with OpenSSL.
Diffstat (limited to 'lib')
-rw-r--r--lib/socket.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/socket.h b/lib/socket.h
index b0c3eda2..0ee43b52 100644
--- a/lib/socket.h
+++ b/lib/socket.h
@@ -48,7 +48,9 @@ typedef struct birdsock {
char *password; /* Password for MD5 authentication */
} sock;
-sock *sk_new(pool *); /* Allocate new socket */
+sock *sock_new(pool *); /* Allocate new socket */
+#define sk_new(X) sock_new(X) /* Wrapper to avoid name collision with OpenSSL */
+
int sk_open(sock *); /* Open socket */
int sk_send(sock *, unsigned len); /* Send data, <0=err, >0=ok, 0=sleep */
int sk_send_to(sock *, unsigned len, ip_addr to, unsigned port); /* sk_send to given destination */