summaryrefslogtreecommitdiff
path: root/giscanner/scannerlexer.l
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2018-11-05 15:42:01 +0000
committerJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2018-11-05 15:43:52 +0000
commit16de6371aa48edc783e359b5508960c5431e8600 (patch)
tree1e55dae73860785ba996c9050ffa1e9fa667f628 /giscanner/scannerlexer.l
parent927d0598b160a6c1dc9b1545ea4aaa1f74c9cc25 (diff)
downloadgobject-introspection-16de6371aa48edc783e359b5508960c5431e8600.tar.gz
scanner: Parse __typeof__ and discard it
GLib 2.57.2 introduced __typeof__ in g_clear_pointer, which the scanner failed to parse. Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/328
Diffstat (limited to 'giscanner/scannerlexer.l')
-rw-r--r--giscanner/scannerlexer.l1
1 files changed, 1 insertions, 0 deletions
diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
index 2f45b66d..6e2796ab 100644
--- a/giscanner/scannerlexer.l
+++ b/giscanner/scannerlexer.l
@@ -177,6 +177,7 @@ stringtext ([^\\\"])|(\\.)
"__restrict__" { return RESTRICT; }
"thread_local" { return THREAD_LOCAL; }
"_Thread_local" { return THREAD_LOCAL; }
+"__typeof__" { if (!parse_ignored_macro()) REJECT; }
"__typeof" { if (!parse_ignored_macro()) REJECT; }
"__volatile" { return VOLATILE; }
"__volatile__" { return VOLATILE; }