From da42ddf96c78a73b4cf5f8854e98e009f4f174a4 Mon Sep 17 00:00:00 2001 From: Determinant Date: Tue, 4 Jun 2019 18:59:00 -0400 Subject: ... --- include/salticidae/netaddr.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'include/salticidae/netaddr.h') diff --git a/include/salticidae/netaddr.h b/include/salticidae/netaddr.h index 917c498..d3c34fe 100644 --- a/include/salticidae/netaddr.h +++ b/include/salticidae/netaddr.h @@ -25,16 +25,16 @@ #ifndef _SALTICIDAE_NETADDR_H #define _SALTICIDAE_NETADDR_H +#include "salticidae/util.h" +#include "salticidae/stream.h" + +#ifdef __cplusplus #include #include #include #include #include -#include "salticidae/util.h" -#include "salticidae/stream.h" - -#ifdef __cplusplus namespace salticidae { /* TODO: IPv6 support */ @@ -129,7 +129,10 @@ using netaddr_t = salticidae::NetAddr; typedef struct netaddr_t netaddr_t; #endif +#ifdef SALTICIDAE_CBINDINGS +#ifdef __cplusplus extern "C" { +#endif netaddr_t *netaddr_new(); netaddr_t *netaddr_new_from_ip_port(uint32_t ip, uint16_t port); @@ -138,6 +141,9 @@ netaddr_t *netaddr_new_from_sipport(const char *ip_port_addr); bool netaddr_is_eq(const netaddr_t *a, const netaddr_t *b); bool netaddr_is_null(const netaddr_t *self); +#ifdef __cplusplus } +#endif +#endif #endif -- cgit v1.2.3