[glib/wip/gsource3: 2/7] move GIOCondition to gmain.h from giochannel.h
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/gsource3: 2/7] move GIOCondition to gmain.h from giochannel.h
- Date: Mon, 14 Jan 2013 20:13:43 +0000 (UTC)
commit 8cbdb34e0f674ce1ab7d1eaec55e21e519fe91cc
Author: Ryan Lortie <desrt desrt ca>
Date: Mon Oct 29 16:33:18 2012 +0100
move GIOCondition to gmain.h from giochannel.h
GIOCondition has uses outside of GIOChannel, so move it to gmain.h.
https://bugzilla.gnome.org/show_bug.cgi?id=686853
glib/giochannel.h | 10 ----------
glib/gmain.h | 11 +++++++++++
2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/glib/giochannel.h b/glib/giochannel.h
index 24ad583..0e7c77d 100644
--- a/glib/giochannel.h
+++ b/glib/giochannel.h
@@ -83,16 +83,6 @@ typedef enum
G_SEEK_END
} 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
{
G_IO_FLAG_APPEND = 1 << 0,
diff --git a/glib/gmain.h b/glib/gmain.h
index 90ff11b..5a6a72a 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -30,6 +30,17 @@
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:
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]