summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--giscanner/scannerparser.y10
-rw-r--r--giscanner/transformer.py2
2 files changed, 3 insertions, 9 deletions
diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y
index d5f9a65c..4d85e33e 100644
--- a/giscanner/scannerparser.y
+++ b/giscanner/scannerparser.y
@@ -878,17 +878,11 @@ enumerator_list
}
enumerator
{
- if (!scanner->private)
- {
- $$ = g_list_append (NULL, $2);
- }
+ $$ = g_list_append (NULL, $2);
}
| enumerator_list ',' enumerator
{
- if (!scanner->private)
- {
- $$ = g_list_append ($1, $3);
- }
+ $$ = g_list_append ($1, $3);
}
;
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 9f2bc153..4ad4d870 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -354,7 +354,7 @@ raise ValueError."""
if prefixlen > 0:
name = child.ident[prefixlen:]
else:
- if child.ident is None:
+ if child.private:
continue
# Ok, the enum members don't have a consistent prefix
# among them, so let's just remove the global namespace