From dab48a1825aed9c810ce83ea8054fa435ecb41be Mon Sep 17 00:00:00 2001 From: Determinant Date: Tue, 4 Jun 2019 22:17:17 -0400 Subject: ... --- src/netaddr.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/netaddr.cpp') diff --git a/src/netaddr.cpp b/src/netaddr.cpp index a3a54bf..1803629 100644 --- a/src/netaddr.cpp +++ b/src/netaddr.cpp @@ -1,22 +1,20 @@ +#include "salticidae/config.h" +#ifdef SALTICIDAE_CBINDINGS #include "salticidae/netaddr.h" -using namespace salticidae; - -#ifdef __cplusplus - extern "C" { -netaddr_t *netaddr_new() { return new NetAddr(); } +netaddr_t *netaddr_new() { return new netaddr_t(); } netaddr_t *netaddr_new_from_ip_port(uint32_t ip, uint16_t port) { - return new NetAddr(ip, port); + return new netaddr_t(ip, port); } netaddr_t *netaddr_new_from_sip_port(const char *ip, uint16_t port) { - return new NetAddr(ip, port); + return new netaddr_t(ip, port); } netaddr_t *netaddr_new_from_sipport(const char *ip_port_addr) { - return new NetAddr(ip_port_addr); + return new netaddr_t(ip_port_addr); } bool netaddr_is_eq(const netaddr_t *a, const netaddr_t *b) { -- cgit v1.2.3