diff options
| author | Christoph Reiter 🐍 <reiter.christoph@gmail.com> | 2018-12-06 18:40:35 +0000 |
|---|---|---|
| committer | Christoph Reiter 🐍 <reiter.christoph@gmail.com> | 2018-12-06 18:40:35 +0000 |
| commit | dee930c5e5b55a51c37e95f43cb9dbf1b5d760fb (patch) | |
| tree | ebac2a2915d360d7d2a03b1eb200a8b9f5ec37b1 /giscanner | |
| parent | aaa7af50f98771efc8172c5dff7a898feda8c423 (diff) | |
| parent | dca00682baa25bc71f6dfbd3c207693bbcc36759 (diff) | |
| download | gobject-introspection-dee930c5e5b55a51c37e95f43cb9dbf1b5d760fb.tar.gz | |
Merge branch 'typeof' into 'master'
scanner: Replace use of typeof with void token
See merge request GNOME/gobject-introspection!78
Diffstat (limited to 'giscanner')
| -rw-r--r-- | giscanner/scannerlexer.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l index 6e2796ab..971b3a73 100644 --- a/giscanner/scannerlexer.l +++ b/giscanner/scannerlexer.l @@ -177,8 +177,8 @@ 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; } +"__typeof__" { if (parse_ignored_macro()) return VOID; else REJECT; } +"__typeof" { if (parse_ignored_macro()) return VOID; else REJECT; } "__volatile" { return VOLATILE; } "__volatile__" { return VOLATILE; } "_Bool" { return BASIC_TYPE; } |