#
#
# patch "src/vocab.h"
#  from [948198e53da18526486a8ce2b1b2e25ec0096999]
#    to [eb557740bfc0e661b544127fd8ca8317ddcbe702]
#
============================================================
--- src/vocab.h	948198e53da18526486a8ce2b1b2e25ec0096999
+++ src/vocab.h	eb557740bfc0e661b544127fd8ca8317ddcbe702
@@ -25,13 +25,14 @@ class Guitone;
 
 // for abort()
 #include <stdlib.h>
-#define F(msg) { \
-          DebugLog::fatal(QString("%1:%2:%3: %4") \
+#define F(msg) \
+    do {  DebugLog::fatal(QString("%1:%2:%3: %4") \
           .arg(__FILE__).arg(__FUNCTION__).arg(__LINE__).arg(QString(msg))); \
           abort(); \
-        }
+    } while (0);
 
-#define I(expr) if (!(expr)) F(QString("invariant \"%1\" violated").arg(#expr))
+#define I(expr) \
+    do { if (!(expr)) { F(QString("invariant \"%1\" violated").arg(#expr)) } } while (0);
 
 //
 // type definitions