scripts/uncrustify: Use 2-spaces indentation for defines too

demo/gtk-libfprint-test.c

@@ -101,11 +101,14 @@ plot_minutiae (unsigned char *rgbdata,
 {
   int i;
 
-#define write_pixel(num) do { \
+  #define write_pixel(num) \
+    do \
+      { \
         rgbdata[((num) * 3)] = 0xff; \
         rgbdata[((num) * 3) + 1] = 0; \
         rgbdata[((num) * 3) + 2] = 0; \
-  } while(0)
+      } \
+    while(0)
 
   for (i = 0; i < minutiae->len; i++)
     {

libfprint/drivers/upekts.c

@@ -196,7 +196,8 @@ struct read_msg_data
 static void __read_msg_async (FpDevice             *dev,
                               struct read_msg_data *udata);
 
-#define READ_MSG_DATA_CB_ERR(dev, udata, error) (udata)->callback (dev, \
+#define READ_MSG_DATA_CB_ERR(dev, udata, error) \
+  (udata)->callback (dev, \
                      READ_MSG_CMD, 0, 0, NULL, 0, (udata)->user_data, error)
 
 static void

libfprint/fpi-log.h

@@ -79,13 +79,16 @@
  *
  * Uses fp_err() to print an error if the @condition is true.
  */
-#define BUG_ON(condition) G_STMT_START          \
-        if (condition) {                        \
+#define BUG_ON(condition) \
+  G_STMT_START          \
+  if (condition) \
+    {                        \
       char *s;                        \
       s = g_strconcat ("BUG: (", #condition, ")", NULL); \
       fp_err ("%s: %s() %s:%d", s, G_STRFUNC, __FILE__, __LINE__); \
       g_free (s);                     \
-          } G_STMT_END
+    } \
+  G_STMT_END
 
 /**
  * BUG:

scripts/uncrustify.cfg

@@ -19,6 +19,7 @@ indent_func_proto_param false
 indent_switch_case      0
 indent_case_brace       2
 indent_paren_close      1
+pp_multiline_define_body_indent 2
 
 # spacing
 sp_arith                        Add
@@ -114,6 +115,7 @@ nl_create_for_one_liner         False
 nl_create_while_one_liner       False
 nl_after_semicolon              True
 nl_multi_line_cond              true
+nl_multi_line_define            true
 
 # mod
 # I'd like these to be remove, but that removes brackets in if { if { foo } }, which i dislike