diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-07-02 22:05:32 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-07-02 22:05:32 +0000 |
| commit | 0227089563a065ae4ee11e67877364f3ce068cdb (patch) | |
| tree | bd55160d60e5acbf9acab091742af78319198121 /gio | |
| parent | 75a75cba12256c42a15ce5b79405eb6ebb417c9d (diff) | |
Fix the build
svn path=/trunk/; revision=7151
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/ChangeLog | 4 | ||||
| -rw-r--r-- | gio/gfilemonitor.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/gio/ChangeLog b/gio/ChangeLog index 13ea0e3dd..85ee2be52 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,5 +1,9 @@ 2008-07-02 Matthias Clasen <mclasen@redhat.com> + * gfilemonitor.c: Fix the build. + +2008-07-02 Matthias Clasen <mclasen@redhat.com> + Bug 536160 – Add g_file_monitor() * gio.symbols: diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c index 4e5293220..5804dc20f 100644 --- a/gio/gfilemonitor.c +++ b/gio/gfilemonitor.c @@ -53,6 +53,9 @@ enum { LAST_SIGNAL }; +/* work around a limitation of the aliasing foo */ +#undef g_file_monitor + G_DEFINE_ABSTRACT_TYPE (GFileMonitor, g_file_monitor, G_TYPE_OBJECT); typedef struct { |