luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-05 12:20:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

move GIOCondition to gmain.h from giochannel.h

Browse Source 
GIOCondition has uses outside of GIOChannel, so move it to gmain.h.

https://bugzilla.gnome.org/show_bug.cgi?id=686853
This commit is contained in:
Ryan Lortie 2012-10-29 16:33:18 +01:00
parent ed8ec635eb
commit 8f7f7f6c42
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/giochannel.h
View File

@ -83,16 +83,6 @@ typedef enum
G_SEEK_END G_SEEK_END
} GSeekType; } GSeekType;
typedef enum /*< flags >*/
{
G_IO_IN GLIB_SYSDEF_POLLIN,
G_IO_OUT GLIB_SYSDEF_POLLOUT,
G_IO_PRI GLIB_SYSDEF_POLLPRI,
G_IO_ERR GLIB_SYSDEF_POLLERR,
G_IO_HUP GLIB_SYSDEF_POLLHUP,
G_IO_NVAL GLIB_SYSDEF_POLLNVAL
} GIOCondition;
typedef enum typedef enum
{ {
G_IO_FLAG_APPEND = 1 << 0, G_IO_FLAG_APPEND = 1 << 0,

11
glib/gmain.h
View File

@ -30,6 +30,17 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum /*< flags >*/
{
G_IO_IN GLIB_SYSDEF_POLLIN,
G_IO_OUT GLIB_SYSDEF_POLLOUT,
G_IO_PRI GLIB_SYSDEF_POLLPRI,
G_IO_ERR GLIB_SYSDEF_POLLERR,
G_IO_HUP GLIB_SYSDEF_POLLHUP,
G_IO_NVAL GLIB_SYSDEF_POLLNVAL
} GIOCondition;
/** /**
* GMainContext: * GMainContext:
* *