core: Fix inconsistent formatting between clang-format 14 and 16

src/core/model/cairo-wideint-private.h

@@ -356,11 +356,11 @@ _cairo_int_96by64_32x64_divrem (cairo_int128_t num,
 
 #undef I
 
+    // clang-format on
+    // NOLINTEND
+
 #ifdef __cplusplus
 };
 #endif
 
-    // clang-format on
-    // NOLINTEND
-
 #endif /* CAIRO_WIDEINT_H */

src/core/model/win32-fd-reader.cc

@@ -16,6 +16,7 @@
  *
  * Author: Tom Goff <thomas.goff@boeing.com>
  */
+
 #include "fatal-error.h"
 #include "fd-reader.h"
 #include "log.h"
@@ -27,7 +28,7 @@
 #include <fcntl.h>
 #include <winsock.h>
 
-//#define pipe(fds) _pipe(fds,4096, _O_BINARY)
+// #define pipe(fds) _pipe(fds,4096, _O_BINARY)
 
 /**
  * \file