From 7c9628930564be95a8be90bd2b21ab031bc1b29f Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Mon, 17 Oct 2022 13:43:08 +0100 Subject: [PATCH] core: Fix inconsistent formatting between clang-format 14 and 16 --- src/core/model/cairo-wideint-private.h | 6 +++--- src/core/model/win32-fd-reader.cc | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/model/cairo-wideint-private.h b/src/core/model/cairo-wideint-private.h index 4250db039..0dbb2e192 100644 --- a/src/core/model/cairo-wideint-private.h +++ b/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 */ diff --git a/src/core/model/win32-fd-reader.cc b/src/core/model/win32-fd-reader.cc index a29f569d5..6a10a5fcd 100644 --- a/src/core/model/win32-fd-reader.cc +++ b/src/core/model/win32-fd-reader.cc @@ -16,6 +16,7 @@ * * Author: Tom Goff */ + #include "fatal-error.h" #include "fd-reader.h" #include "log.h" @@ -27,7 +28,7 @@ #include #include -//#define pipe(fds) _pipe(fds,4096, _O_BINARY) +// #define pipe(fds) _pipe(fds,4096, _O_BINARY) /** * \file