From 42646baa1a57810634b055278130a9ec988fb74d Mon Sep 17 00:00:00 2001 From: Quinn Date: Wed, 21 May 2025 12:13:15 +0200 Subject: [PATCH] don't indent post-processes directives --- .clang-format | 2 +- src/util/atrb.h | 64 ++++++++++++++++++++++++------------------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/.clang-format b/.clang-format index 5d2d9ff..7c0076a 100644 --- a/.clang-format +++ b/.clang-format @@ -194,7 +194,7 @@ IndentCaseBlocks: false IndentGotoLabels: true IndentExternBlock: AfterExternBlock # (AfterExternBlock,NoIndent,Indent) IndentRequiresClause: false -IndentPPDirectives: AfterHash # preprocessor indent style (None,AfterHash,BeforeHash) +IndentPPDirectives: None # preprocessor indent style (None,AfterHash,BeforeHash) PPIndentWidth: 1 --- diff --git a/src/util/atrb.h b/src/util/atrb.h index d07a5b0..23fbb37 100644 --- a/src/util/atrb.h +++ b/src/util/atrb.h @@ -14,38 +14,36 @@ // define the attributes where possible #if defined(__GNUC__) || defined(__clang__) -# if __has_attribute(deprecated) -# undef atrb_deprecated -# define atrb_deprecated __attribute__((deprecated)) -# endif - -# if __has_attribute(unused) -# undef atrb_unused -# define atrb_unused __attribute__((unused)) -# endif - -# if __has_attribute(pure) -# undef atrb_pure -# define atrb_pure __attribute__((pure)) -# endif - - -# if __has_attribute(const) -# undef atrb_const -# define atrb_const __attribute__((const)) -# endif - -# if __has_attribute(format) -# undef atrb_format -# define atrb_format(...) __attribute__((format(__VA_ARGS__))) -# endif - -# if __has_attribute(nonnull) -# undef atrb_nonnull -# define atrb_nonnull(...) __attribute__((nonnull(__VA_ARGS__))) -# endif -#elif defined(_MSC_VER) -# undef atrb_depatrb_deprecated -# define atrb_deprecated __declspec(deprecated) +#if __has_attribute(deprecated) +#undef atrb_deprecated +#define atrb_deprecated __attribute__((deprecated)) #endif +#if __has_attribute(unused) +#undef atrb_unused +#define atrb_unused __attribute__((unused)) +#endif + +#if __has_attribute(pure) +#undef atrb_pure +#define atrb_pure __attribute__((pure)) +#endif + +#if __has_attribute(const) +#undef atrb_const +#define atrb_const __attribute__((const)) +#endif + +#if __has_attribute(format) +#undef atrb_format +#define atrb_format(...) __attribute__((format(__VA_ARGS__))) +#endif + +#if __has_attribute(nonnull) +#undef atrb_nonnull +#define atrb_nonnull(...) __attribute__((nonnull(__VA_ARGS__))) +#endif +#elif defined(_MSC_VER) +#undef atrb_depatrb_deprecated +#define atrb_deprecated __declspec(deprecated) +#endif