From 8e5a72a005c24b462531fcc05b4255ac985ba19d Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Tue, 29 Sep 2015 23:08:00 +0200
Subject: lib: Fix type builtins

Move VteRegexError to vteenums.h to fix vtetypebuiltins generation.
---
 doc/reference/vte.types |  5 ++---
 src/vte/vteenums.h      | 20 ++++++++++++++++++++
 src/vte/vteregex.h      |  8 --------
 src/vteregex.cc         |  1 +
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/doc/reference/vte.types b/doc/reference/vte.types
index c508837f..d7db2a09 100644
--- a/doc/reference/vte.types
+++ b/doc/reference/vte.types
@@ -3,12 +3,10 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include "vte.h"
-#include "vteversion.h"
-#include "vtepty.h"
-#include "vtetypebuiltins.h"
 
 vte_pty_get_type
 vte_terminal_get_type
+vte_regex_get_type
 
 vte_pty_error_get_type
 vte_pty_flags_get_type
@@ -16,3 +14,4 @@ vte_cursor_blink_mode_get_type
 vte_cursor_shape_get_type
 vte_erase_binding_get_type
 vte_write_flags_get_type
+vte_regex_error_get_type
diff --git a/src/vte/vteenums.h b/src/vte/vteenums.h
index ceb2486c..3fa4a47c 100644
--- a/src/vte/vteenums.h
+++ b/src/vte/vteenums.h
@@ -117,6 +117,26 @@ typedef enum {
   VTE_WRITE_DEFAULT = 0
 } VteWriteFlags;
 
+/**
+ * VteRegexError:
+ * @VTE_REGEX_ERROR_INCOMPATIBLE: The PCRE2 library was built without
+ *   Unicode support which is required for VTE
+ * @VTE_REGEX_ERROR_NOT_SUPPORTED: Regexes are not supported because VTE was
+ *   built without PCRE2 support
+ *
+ * An enum type for regex errors. In addition to the values listed above,
+ * any PCRE2_ERR* value (which areall negative values) may occur.
+ *
+ * Since: 0.44
+ */
+typedef enum {
+        /* Negative values are PCRE2 errors */
+
+        /* VTE specific values */
+        VTE_REGEX_ERROR_INCOMPATIBLE  = G_MAXINT-1,
+        VTE_REGEX_ERROR_NOT_SUPPORTED = G_MAXINT
+} VteRegexError;
+
 G_END_DECLS
 
 #endif /* __VTE_VTE_ENUMS_H__ */
diff --git a/src/vte/vteregex.h b/src/vte/vteregex.h
index a248e9e3..9178d091 100644
--- a/src/vte/vteregex.h
+++ b/src/vte/vteregex.h
@@ -42,14 +42,6 @@ GQuark vte_regex_error_quark (void);
 /* This is PCRE2_NO_UTF_CHECK | PCRE2_UTF */
 #define VTE_REGEX_FLAGS_DEFAULT (0x00080000u | 0x40000000u)
 
-typedef enum {
-        /* Negative values are PCRE2 errors */
-
-        /* VTE specific values */
-        VTE_REGEX_ERROR_INCOMPATIBLE  = G_MAXINT-1,
-        VTE_REGEX_ERROR_NOT_SUPPORTED = G_MAXINT
-} VteRegexError;
-
 VteRegex *vte_regex_ref      (VteRegex *regex) _VTE_GNUC_NONNULL(1);
 
 VteRegex *vte_regex_unref    (VteRegex *regex) _VTE_GNUC_NONNULL(1);
diff --git a/src/vteregex.cc b/src/vteregex.cc
index 2e578f18..9d537e76 100644
--- a/src/vteregex.cc
+++ b/src/vteregex.cc
@@ -25,6 +25,7 @@
 #include "config.h"
 
 #include "vtemacros.h"
+#include "vteenums.h"
 #include "vteregex.h"
 #include "vteregexinternal.hh"
 
-- 
cgit v1.2.1