[glib/meson-for-merge] Revert "mkenums: Support public/private trigraph"

[Matthias Clasen <matthiasc src gnome org>]

commit 41385745e73df690ff3ab9f07d975626935a51de
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jul 13 19:03:00 2017 -0400

    Revert "mkenums: Support public/private trigraph"
    
    This reverts commit 9ba17d511e325eec1e0c1c27cb4d37de4f12ac1e.
    
    This conflicts with the python port in the meson branch.

 gobject/glib-mkenums.in |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)
---
diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
index 9316e57..219a166 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -19,7 +19,6 @@ my $option_lowercase_name;    # DEPRECATED.  A lower case name to use as part
                                # uses abnormal capitalization and we can not
                                # guess where to put the underscores.
 my $seenbitshift;              # Have we seen bitshift operators?
-my $seenprivate;                # Have we seen a private option?
 my $enum_prefix;               # Prefix for this enumeration
 my $enumname;                  # Name for this enumeration
 my $enumshort;                 # $enumname without prefix
@@ -116,8 +115,6 @@ sub parse_entries {
                $seenbitshift = 1;
            }
 
-            next if $seenprivate;
-
            if (defined $options) {
                my %options = parse_trigraph($options);
                if (!defined $options{skip}) {
@@ -128,21 +125,6 @@ sub parse_entries {
            }
        } elsif (m@^\s*\#@) {
            # ignore preprocessor directives
-        } elsif (m@^\s*
-                   /\*< (([^*]|\*(?!/))*) >\s*\*/
-                   \s*$
-                  @x) {
-            my ($options) = ($1);
-
-            if (defined $options) {
-                my %options = parse_trigraph($options);
-                if (defined $options{private}) {
-                    $seenprivate = 1;
-                }
-                elsif (defined $options{public}) {
-                    $seenprivate = 0;
-                }
-            }
        } else {
            print STDERR "$0: $file_name:$.: Failed to parse `$_'\n";
        }
@@ -371,7 +353,6 @@ while (<>) {
        }
 
        $seenbitshift = 0;
-        $seenprivate = 0;
        @entries = ();
 
        # Now parse the entries