summaryrefslogtreecommitdiff
path: root/giscanner/scannerlexer.l
diff options
context:
space:
mode:
authorGiovanni Campagna <gcampagn@redhat.com>2013-09-24 16:32:43 +0200
committerGiovanni Campagna <gcampagn@redhat.com>2013-09-24 16:32:43 +0200
commit3a050a9cab63eef09f90015a12c828aa621198cb (patch)
treec864ecc3d49229c6179e917db24fe448c6e06951 /giscanner/scannerlexer.l
parentebffefb27ed81b095106056698dd8db9a21fb6f9 (diff)
downloadgobject-introspection-3a050a9cab63eef09f90015a12c828aa621198cb.tar.gz
Revert "scannerlexer: don't reject __volatile__ tokens"
This reverts commit ebffefb27ed81b095106056698dd8db9a21fb6f9. Pushed by mistake
Diffstat (limited to 'giscanner/scannerlexer.l')
-rw-r--r--giscanner/scannerlexer.l4
1 files changed, 2 insertions, 2 deletions
diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
index 032732fe..554e2da7 100644
--- a/giscanner/scannerlexer.l
+++ b/giscanner/scannerlexer.l
@@ -150,8 +150,8 @@ stringtext ([^\\\"])|(\\.)
"__signed__" { return SIGNED; }
"__restrict" { return RESTRICT; }
"__typeof" { if (!parse_ignored_macro()) REJECT; }
-"__volatile" { return VOLATILE; }
-"__volatile__" { return VOLATILE; }
+"__volatile" { if (!parse_ignored_macro()) REJECT; }
+"__volatile__" { if (!parse_ignored_macro()) REJECT; }
"_Bool" { return BOOL; }
"G_GINT64_CONSTANT" { return INTL_CONST; }