diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2008-12-03 05:26:39 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2008-12-03 05:26:39 +0000 |
| commit | c846d3000225e4887948145bd7162e7e8a5af953 (patch) | |
| tree | f953fbb6b2043a85979402e1cb1780d99ae9c3a3 /libsylph/socket.c | |
| parent | 543bf7f1c24908bda2df3c0ea523b032b3a00a74 (diff) | |
added SYL_ prefix to SockFlags enum to avoid confliction with recent glibc header file.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2088 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'libsylph/socket.c')
| -rw-r--r-- | libsylph/socket.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libsylph/socket.c b/libsylph/socket.c index 55ae3cfd..97d273d7 100644 --- a/libsylph/socket.c +++ b/libsylph/socket.c @@ -1,6 +1,6 @@ /* * LibSylph -- E-Mail client library - * Copyright (C) 1999-2007 Hiroyuki Yamamoto + * Copyright (C) 1999-2008 Hiroyuki Yamamoto * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -383,9 +383,9 @@ static gint set_nonblocking_mode(gint fd, gboolean nonblock) sock = sock_find_from_fd(fd); if (sock) { if (nonblock) { - SOCK_SET_FLAGS(sock->flags, SOCK_NONBLOCK); + SOCK_SET_FLAGS(sock->flags, SYL_SOCK_NONBLOCK); } else { - SOCK_UNSET_FLAGS(sock->flags, SOCK_NONBLOCK); + SOCK_UNSET_FLAGS(sock->flags, SYL_SOCK_NONBLOCK); } } debug_print("set nonblocking mode to %d\n", nonblock); @@ -418,9 +418,9 @@ gint sock_set_nonblocking_mode(SockInfo *sock, gboolean nonblock) ret = set_nonblocking_mode(sock->sock, nonblock); if (ret == 0) { if (nonblock) { - SOCK_SET_FLAGS(sock->flags, SOCK_NONBLOCK); + SOCK_SET_FLAGS(sock->flags, SYL_SOCK_NONBLOCK); } else { - SOCK_UNSET_FLAGS(sock->flags, SOCK_NONBLOCK); + SOCK_UNSET_FLAGS(sock->flags, SYL_SOCK_NONBLOCK); } } @@ -882,7 +882,7 @@ SockInfo *sock_connect(const gchar *hostname, gushort port) sockinfo->hostname = g_strdup(hostname); sockinfo->port = port; sockinfo->state = CONN_ESTABLISHED; - sockinfo->flags = SOCK_CHECK_IO; + sockinfo->flags = SYL_SOCK_CHECK_IO; sock_list = g_list_prepend(sock_list, sockinfo); @@ -951,7 +951,7 @@ static gboolean sock_connect_async_cb(GIOChannel *source, sockinfo->hostname = g_strdup(conn_data->hostname); sockinfo->port = conn_data->port; sockinfo->state = CONN_ESTABLISHED; - sockinfo->flags = SOCK_NONBLOCK; + sockinfo->flags = SYL_SOCK_NONBLOCK; sock_list = g_list_prepend(sock_list, sockinfo); |