merge: build: don't treat stddef.h specially

 * .clang-format: Don't special-case <stddef.h>
 * Sort include <stddef.h>
 * test/store/common.c: Workaround macOS bug

.clang-format

@@ -13,8 +13,6 @@ IncludeCategories:
     Priority:   -130
   - Regex:      '"acutest\.h"'
     Priority:   -120
-  - Regex:      '<stddef\.h>'
-    Priority:   -110
   - Regex:      '<.*>'
     Priority:   -100
 

address/address.h

@@ -24,8 +24,8 @@
 #ifndef MUTT_ADDRESS_ADDRESS_H
 #define MUTT_ADDRESS_ADDRESS_H
 
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include "mutt/lib.h"
 

address/config_type.c

@@ -35,9 +35,9 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "config/lib.h"

alias/alias.c

@@ -31,9 +31,9 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <pwd.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

alias/array.c

@@ -27,8 +27,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "gui.h"
 

alias/config.c

@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "config/lib.h"
 #include "expando/lib.h"

alias/functions.c

@@ -31,8 +31,8 @@
 #ifdef _MAKEDOC
 #include "docs/makedoc_defs.h"
 #else
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include "mutt/lib.h"
 #include "address/lib.h"

alias/lib.h

@@ -43,8 +43,8 @@
 #ifndef MUTT_ALIAS_LIB_H
 #define MUTT_ALIAS_LIB_H
 
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "core/lib.h"
 #include "complete/lib.h"

alias/sort.c

@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "address/lib.h"
 #include "config/lib.h"

attach/cid.c

@@ -28,8 +28,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include "email/lib.h"

attach/lib.c

@@ -27,8 +27,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "email/lib.h"
 

autocrypt/config.c

@@ -27,8 +27,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "private.h"
 #include "config/lib.h"
 #include "expando/lib.h"

autocrypt/db.c

@@ -30,9 +30,9 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <sqlite3.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <sys/stat.h>
 #include "private.h"
 #include "mutt/lib.h"

autocrypt/gpgme.c

@@ -29,10 +29,10 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <gpg-error.h>
 #include <gpgme.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "private.h"
 #include "mutt/lib.h"
 #include "address/lib.h"

autocrypt/schema.c

@@ -28,8 +28,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <sqlite3.h>
+#include <stddef.h>
 #include "private.h"
 #include "mutt/lib.h"
 

browser/complete.c

@@ -27,8 +27,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <string.h>
 #include "mutt/lib.h"
 #include "core/lib.h"

browser/config.c

@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "config/lib.h"
 #include "lib.h"

browser/sort.c

@@ -28,8 +28,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <sys/stat.h>
 #include "mutt/lib.h"
 #include "config/lib.h"

color/command.c

@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "config/lib.h"

color/curses.c

@@ -27,8 +27,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "gui/lib.h"
 #include "color.h"

color/merged.c

@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "attr.h"
 #include "color.h"

color/parse_ansi.c

@@ -27,9 +27,9 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <ctype.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include "mutt/lib.h"
 #include "gui/lib.h"

color/parse_color.c

@@ -25,8 +25,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include "mutt/lib.h"
 #include "core/lib.h"

color/quoted.c

@@ -27,8 +27,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "core/lib.h"
 #include "quoted.h"

color/quoted.h

@@ -24,8 +24,8 @@
 #define MUTT_COLOR_QUOTED_H
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "core/lib.h"
 #include "attr.h"
 #include "color.h"

color/regex.c

@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "config/lib.h"

color/simple.c

@@ -28,8 +28,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "gui/lib.h"
 #include "attr.h"

complete/lib.h

@@ -36,8 +36,8 @@
 #ifndef MUTT_COMPLETE_LIB_H
 #define MUTT_COMPLETE_LIB_H
 
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 // IWYU pragma: begin_keep
 #include "compapi.h"
 #include "data.h"

compose/attach.c

@@ -57,8 +57,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "private.h"
 #include "mutt/lib.h"
 #include "config/lib.h"

compose/config.c

@@ -28,8 +28,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "mutt/lib.h"
 #include "config/lib.h"
 #include "expando/lib.h"

compress/lz4.c

@@ -30,9 +30,9 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <limits.h>
 #include <lz4.h>
+#include <stddef.h>
 #include "private.h"
 #include "mutt/lib.h"
 #include "lib.h"

config/bool.c

@@ -33,9 +33,9 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "bool.h"

config/enum.c

@@ -31,8 +31,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <limits.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "enum.h"

config/number.c

@@ -34,8 +34,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <limits.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "set.h"

config/path.c

@@ -36,8 +36,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "set.h"

config/quad.c

@@ -36,8 +36,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <limits.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "quad.h"

config/regex.c

@@ -35,8 +35,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "regex2.h"

config/slist.c

@@ -34,8 +34,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <limits.h>
+#include <stddef.h>
 #include <stdint.h>
 #include "mutt/lib.h"
 #include "set.h"

conn/config.c

@@ -29,8 +29,8 @@
  */
 
 #include "config.h"
-#include <stddef.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include "config/lib.h"
 
 /**