[gobject-introspection/gnome-3-30] scanner: make using bool without stdbool include work again. Fixes #247

[Christoph Reiter <creiter src gnome org>]

commit 02caf8c82e59afb88d45c8c25f66771224ed5ab3
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Fri Dec 21 12:32:34 2018 +0100

    scanner: make using bool without stdbool include work again. Fixes #247
    
    Backport of !116

 giscanner/scannerlexer.l | 1 +
 giscanner/transformer.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
index 543edb30..c63b56d1 100644
--- a/giscanner/scannerlexer.l
+++ b/giscanner/scannerlexer.l
@@ -183,6 +183,7 @@ stringtext                          ([^\\\"])|(\\.)
 "__volatile"                           { return VOLATILE; }
 "__volatile__"                         { return VOLATILE; }
 "_Bool"                                        { return BASIC_TYPE; }
+"bool"                                 { return BASIC_TYPE; }
 "typedef char __static_assert_t".*"\n" { ++lineno; /* Ignore */ }
 "__cdecl"                              { /* Ignore */ }
 "__declspec(deprecated(".*"))"         { /* Ignore */ }
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 335e229f..200470d7 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -702,7 +702,7 @@ raise ValueError."""
         # because of different ABI, but this usually works fine,
         # so for backward compatibility lets continue for now:
         # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/24#note_92792
-        if canonical == '_Bool':
+        if canonical in ('_Bool', 'bool'):
             canonical = 'gboolean'
             base = canonical