diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/network-openssl.c | 14 | ||||
| -rw-r--r-- | src/core/network.c | 22 |
2 files changed, 5 insertions, 31 deletions
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c index acab35f1..547f86c1 100644 --- a/src/core/network-openssl.c +++ b/src/core/network-openssl.c @@ -97,12 +97,7 @@ static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, X509 *cert) #if GLIB_MAJOR_VERSION < 2 -#ifdef G_CAN_INLINE -G_INLINE_FUNC -#else -static -#endif -GIOError ssl_errno(gint e) +static GIOError ssl_errno(gint e) { switch(e) { @@ -239,12 +234,7 @@ static GIOFuncs irssi_ssl_channel_funcs = #else /* GLIB_MAJOR_VERSION < 2 */ -#ifdef G_CAN_INLINE -G_INLINE_FUNC -#else -static -#endif -GIOStatus ssl_errno(gint e) +static GIOStatus ssl_errno(gint e) { switch(e) { diff --git a/src/core/network.c b/src/core/network.c index 1baf72c6..2ce929f2 100644 --- a/src/core/network.c +++ b/src/core/network.c @@ -70,13 +70,7 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2) } -/* copy IP to sockaddr */ -#ifdef G_CAN_INLINE -G_INLINE_FUNC -#else -static -#endif -void sin_set_ip(union sockaddr_union *so, const IPADDR *ip) +static void sin_set_ip(union sockaddr_union *so, const IPADDR *ip) { if (ip == NULL) { #ifdef HAVE_IPV6 @@ -110,12 +104,7 @@ void sin_get_ip(const union sockaddr_union *so, IPADDR *ip) memcpy(&ip->ip, &so->sin.sin_addr, 4); } -#ifdef G_CAN_INLINE -G_INLINE_FUNC -#else -static -#endif -void sin_set_port(union sockaddr_union *so, int port) +static void sin_set_port(union sockaddr_union *so, int port) { #ifdef HAVE_IPV6 if (so->sin.sin_family == AF_INET6) @@ -125,12 +114,7 @@ void sin_set_port(union sockaddr_union *so, int port) so->sin.sin_port = htons((unsigned short)port); } -#ifdef G_CAN_INLINE -G_INLINE_FUNC -#else -static -#endif -int sin_get_port(union sockaddr_union *so) +static int sin_get_port(union sockaddr_union *so) { #ifdef HAVE_IPV6 if (so->sin.sin_family == AF_INET6) |