summaryrefslogtreecommitdiff
path: root/src/ivyglibloop.c
diff options
context:
space:
mode:
authorbustico2011-01-24 13:39:15 +0000
committerbustico2011-01-24 13:39:15 +0000
commit7d534bbf798a4036dd3cee1c36df05b2c34defe8 (patch)
tree4618cc39a3ca54b0f1849bd11a86ea46c169dbc0 /src/ivyglibloop.c
parent7cd9cd6f68f0d49d0504966141d70c4324bc73ff (diff)
downloadivy-c-7d534bbf798a4036dd3cee1c36df05b2c34defe8.zip
ivy-c-7d534bbf798a4036dd3cee1c36df05b2c34defe8.tar.gz
ivy-c-7d534bbf798a4036dd3cee1c36df05b2c34defe8.tar.bz2
ivy-c-7d534bbf798a4036dd3cee1c36df05b2c34defe8.tar.xz
make ivy-c c++ compiler compliant
use last version (1.9.3) of uthash header
Diffstat (limited to 'src/ivyglibloop.c')
-rw-r--r--src/ivyglibloop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ivyglibloop.c b/src/ivyglibloop.c
index 8bd2ad8..760d878 100644
--- a/src/ivyglibloop.c
+++ b/src/ivyglibloop.c
@@ -67,7 +67,7 @@ void IvyChannelInit(void) {
-Channel IvyChannelAdd(HANDLE fd, void *data,
+Channel IvyChannelAdd(IVY_HANDLE fd, void *data,
ChannelHandleDelete handle_delete,
ChannelHandleRead handle_read,
ChannelHandleWrite handle_write
@@ -85,7 +85,7 @@ Channel IvyChannelAdd(HANDLE fd, void *data,
channel->io_channel = io_channel;
channel->id_read = g_io_add_watch( io_channel, G_IO_IN,
IvyGlibHandleChannelRead, channel);
- channel->id_delete = g_io_add_watch( io_channel, G_IO_ERR | G_IO_HUP,
+ channel->id_delete = g_io_add_watch( io_channel, (GIOCondition) (G_IO_ERR | G_IO_HUP),
IvyGlibHandleChannelDelete, channel);
}
return channel;