From 34b5cee533e457cb72314a0fcca4c227bde8487a Mon Sep 17 00:00:00 2001
From: oni-link <knil.ino@gmail.com>
Date: Sat, 2 May 2015 13:10:59 +0200
Subject: [PATCH] Fix compiling with gcc 5. #2566

Pattern matching failed, because the preprocessor added additional
linemarkers around type Bool.
---
 scripts/gendeclarations.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/gendeclarations.lua b/scripts/gendeclarations.lua
index 9398bbb31c..4e74e4e301 100755
--- a/scripts/gendeclarations.lua
+++ b/scripts/gendeclarations.lua
@@ -87,6 +87,15 @@ local spaces = any_amount(branch(
       any_character
     )),
     lit('\n')
+  ),
+  -- Linemarker inserted by preprocessor
+  concat(
+    lit('# '),
+    any_amount(concat(
+      neg_look_ahead(lit('\n')),
+      any_character
+    )),
+    lit('\n')
   )
 ))
 local typ_part = concat(
@@ -206,6 +215,8 @@ while init ~= nil do
       declaration = declaration:gsub('/%*.-%*/', '')
       declaration = declaration:gsub('//.-\n', '\n')
 
+      declaration = declaration:gsub('# .-\n', '')
+
       declaration = declaration:gsub('\n', ' ')
       declaration = declaration:gsub('%s+', ' ')
       declaration = declaration:gsub(' ?%( ?', '(')
@@ -220,6 +231,7 @@ while init ~= nil do
       else
         non_static = non_static .. declaration
       end
+      init = e
     end
   end
 end