From 87dc86240835313f0cfe503b2d68a09301ad6240 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Sun, 15 Jan 2012 00:34:56 +0100
Subject: [PATCH] Ensure to generate a flags GType for empty Flags enums

When the flags enum only has the default NONE = 0 entry, glib-mkenums
creates an enum type for it, not a flags type. Add an annotation to the
enum to ensure the correct GType is created.

Bug #667938.
---
 gio/gioenums.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gio/gioenums.h b/gio/gioenums.h
index 8e0ec32d6..852941d3e 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -218,7 +218,7 @@ typedef enum {
  *
  * Flags used when mounting a mount.
  */
-typedef enum {
+typedef enum /*< flags >*/ {
   G_MOUNT_MOUNT_NONE = 0
 } GMountMountFlags;
 
@@ -244,7 +244,7 @@ typedef enum {
  *
  * Since: 2.22
  */
-typedef enum {
+typedef enum /*< flags >*/ {
   G_DRIVE_START_NONE = 0
 } GDriveStartFlags;
 
@@ -668,7 +668,7 @@ typedef enum {
  * 
  * Since: 2.32
  **/
-typedef enum {
+typedef enum /*< flags >*/ {
   G_RESOURCE_LOOKUP_FLAGS_NONE       = 0,
 } GResourceLookupFlags;
 
@@ -1515,7 +1515,6 @@ typedef enum
 } GDBusObjectManagerClientFlags;
 
 /**
-<<<<<<< HEAD
  * GTlsDatabaseVerifyFlags:
  * @G_TLS_DATABASE_VERIFY_NONE: No verification flags
  *
@@ -1523,7 +1522,7 @@ typedef enum
  *
  * Since: 2.30
  */
-typedef enum {
+typedef enum /*< flags >*/ {
   G_TLS_DATABASE_VERIFY_NONE = 0
 } GTlsDatabaseVerifyFlags;