Fixed linux build

This commit is contained in:
Yevgen Muntyan 2016-10-03 00:31:27 -07:00
parent 3623d4f77e
commit 965d30d96d
2 changed files with 5 additions and 5 deletions

View File

@ -25,10 +25,10 @@ moo_sources += \
mooglib/moo-stat.h \ mooglib/moo-stat.h \
mooglib/moo-time.h mooglib/moo-time.h
EXTRA_DIST += \ EXTRA_DIST += \
mooglib/moo-glib.c mooglib/moo-glib.cpp
if !MOO_OS_WIN32 if !MOO_OS_WIN32
moo_sources += mooglib/moo-glib.c moo_sources += mooglib/moo-glib.cpp
endif endif
EXTRA_DIST += marshals.list EXTRA_DIST += marshals.list

View File

@ -155,9 +155,9 @@ input_channel_start_io (int fd,
*io_channel = g_io_channel_unix_new (fd); *io_channel = g_io_channel_unix_new (fd);
g_io_channel_set_encoding (*io_channel, NULL, NULL); g_io_channel_set_encoding (*io_channel, NULL, NULL);
*io_watch = _moo_io_add_watch (*io_channel, *io_watch = g_io_add_watch (*io_channel,
G_IO_IN | G_IO_PRI | G_IO_HUP | G_IO_ERR, G_IO_IN | G_IO_PRI | G_IO_HUP | G_IO_ERR,
io_func, data); io_func, data);
source = g_main_context_find_source_by_id (NULL, *io_watch); source = g_main_context_find_source_by_id (NULL, *io_watch);
g_source_set_can_recurse (source, TRUE); g_source_set_can_recurse (source, TRUE);