diff options
| author | Timo Sirainen <cras@irssi.org> | 2000-11-23 23:29:32 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-11-23 23:29:32 +0000 |
| commit | d1d70fd5d78af01040983831cbe9aa79f1d56425 (patch) | |
| tree | da9c11fb31eafff80a27b5d8c2e108e271c1538d /src/core | |
| parent | 8961d23171ff5d8e9eb15c1f935c9447d24ad2dc (diff) | |
| download | irssi-d1d70fd5d78af01040983831cbe9aa79f1d56425.zip | |
s/enum GInputCondition/int/ - enums aren't supposed to orred together i
think.. at least MIPSpro gave warnings about it and it also feels wrong :)
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@865 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/misc.c | 8 | ||||
| -rw-r--r-- | src/core/net-nonblock.c | 3 | ||||
| -rw-r--r-- | src/core/servers.c | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/core/misc.c b/src/core/misc.c index 80b60871..d57c4881 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -28,7 +28,7 @@ #endif typedef struct { - GInputCondition condition; + int condition; GInputFunction function; void *data; } IRSSI_INPUT_REC; @@ -37,7 +37,7 @@ static int irssi_io_invoke(GIOChannel *source, GIOCondition condition, void *data) { IRSSI_INPUT_REC *rec = data; - GInputCondition icond = (GInputCondition)0; + int icond = 0; if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) { /* error, we have to call the function.. */ @@ -60,7 +60,7 @@ static int irssi_io_invoke(GIOChannel *source, GIOCondition condition, return TRUE; } -int g_input_add_full(int source, int priority, GInputCondition condition, +int g_input_add_full(int source, int priority, int condition, GInputFunction function, void *data) { IRSSI_INPUT_REC *rec; @@ -87,7 +87,7 @@ int g_input_add_full(int source, int priority, GInputCondition condition, return result; } -int g_input_add(int source, GInputCondition condition, +int g_input_add(int source, int condition, GInputFunction function, void *data) { return g_input_add_full(source, G_PRIORITY_DEFAULT, condition, diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c index b21dca08..c6342e08 100644 --- a/src/core/net-nonblock.c +++ b/src/core/net-nonblock.c @@ -190,8 +190,7 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, int pipe) return; } - rec->tag = g_input_add(handle, - (GInputCondition) (G_INPUT_READ|G_INPUT_WRITE), + rec->tag = g_input_add(handle, G_INPUT_READ | G_INPUT_WRITE, (GInputFunction) simple_init, rec); } diff --git a/src/core/servers.c b/src/core/servers.c index 1cdee751..9ec53902 100644 --- a/src/core/servers.c +++ b/src/core/servers.c @@ -200,8 +200,7 @@ static void server_connect_callback_readpipe(SERVER_REC *server) server->handle = net_sendbuffer_create(handle, 0); server->connect_tag = - g_input_add(handle, - (GInputCondition) (G_INPUT_WRITE|G_INPUT_READ), + g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ, (GInputFunction) server_connect_callback_init, server); signal_emit("server connecting", 2, server, &iprec.ip); |