Merge branch 'GKqueueFileMonitor' into 'master'

gio: Don't redefine GKqueueFileMonitor

Closes #1506

See merge request GNOME/glib!291
This commit is contained in:
Philip Withnall 2018-09-03 11:47:33 +00:00
commit f63bc3072c

View File

@ -75,7 +75,7 @@ typedef GLocalFileMonitorClass GKqueueFileMonitorClass;
*
* To distinguish between a directory monitor and a regular file monitor, check
* whether sub_file is NULL. */
typedef struct _GKqueueFileMonitor
struct _GKqueueFileMonitor
{
GLocalFileMonitor parent_instance;
@ -85,7 +85,7 @@ typedef struct _GKqueueFileMonitor
GFileMonitor *fallback;
GFile *fbfile;
#endif
} GKqueueFileMonitor;
};
#ifdef __clang__
#pragma clang diagnostic pop