aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Remove the inline declarations, patch by nailbiter

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4040 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Valentin Batz 2005-10-15 08:46:35 +00:00 committed by vb
parent 5c867d6726
commit 674eec8fd2
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/network-openssl.c
View File

@ -97,12 +97,7 @@ static gboolean irssi_ssl_verify(SSL *ssl, SSL_CTX *ctx, X509 *cert)
#if GLIB_MAJOR_VERSION < 2 #if GLIB_MAJOR_VERSION < 2
#ifdef G_CAN_INLINE static GIOError ssl_errno(gint e)
G_INLINE_FUNC
#else
static
#endif
GIOError ssl_errno(gint e)
{ {
switch(e) switch(e)
{ {
@ -239,12 +234,7 @@ static GIOFuncs irssi_ssl_channel_funcs =
#else /* GLIB_MAJOR_VERSION < 2 */ #else /* GLIB_MAJOR_VERSION < 2 */
#ifdef G_CAN_INLINE static GIOStatus ssl_errno(gint e)
G_INLINE_FUNC
#else
static
#endif
GIOStatus ssl_errno(gint e)
{ {
switch(e) switch(e)
{ {

22
src/core/network.c
View File

@ -70,13 +70,7 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2)
} }
/* copy IP to sockaddr */ static void sin_set_ip(union sockaddr_union *so, const IPADDR *ip)
#ifdef G_CAN_INLINE
G_INLINE_FUNC
#else
static
#endif
void sin_set_ip(union sockaddr_union *so, const IPADDR *ip)
{ {
if (ip == NULL) { if (ip == NULL) {
#ifdef HAVE_IPV6 #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); memcpy(&ip->ip, &so->sin.sin_addr, 4);
} }
#ifdef G_CAN_INLINE static void sin_set_port(union sockaddr_union *so, int port)
G_INLINE_FUNC
#else
static
#endif
void sin_set_port(union sockaddr_union *so, int port)
{ {
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (so->sin.sin_family == AF_INET6) 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); so->sin.sin_port = htons((unsigned short)port);
} }
#ifdef G_CAN_INLINE static int sin_get_port(union sockaddr_union *so)
G_INLINE_FUNC
#else
static
#endif
int sin_get_port(union sockaddr_union *so)
{ {
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (so->sin.sin_family == AF_INET6) if (so->sin.sin_family == AF_INET6)