From 5b1c17f85a98f95629d8d4822dc57c5e13156ede Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 14 Aug 2024 05:05:44 +0200 Subject: [PATCH] confdefs: Fix extensions.h Resurrect proper file comment. Order copyrights according to template. Remove white space at the end of line. Do error checks early. Define objects under optional extern "C". Update #5047. --- cpukit/include/rtems/confdefs/extensions.h | 39 ++++++++++++---------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/cpukit/include/rtems/confdefs/extensions.h b/cpukit/include/rtems/confdefs/extensions.h index 39e1dd5084..398e6aec2f 100644 --- a/cpukit/include/rtems/confdefs/extensions.h +++ b/cpukit/include/rtems/confdefs/extensions.h @@ -1,12 +1,17 @@ /* SPDX-License-Identifier: BSD-2-Clause */ /** - * @brief User Extensions Configuration Options Evaluator + * @file + * + * @ingroup RTEMSImplApplConfig + * + * @brief This header file evaluates configuration options related to the user + * extensions configuration. */ /* - * Copyright (C) 2020 embedded brains GmbH & Co. KG * Copyright (C) 2024 Mohamed Hassan + * Copyright (C) 2020 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -85,26 +90,14 @@ #endif #endif +#if !defined(CONFIGURE_STACK_CHECKER_ENABLED) && defined(CONFIGURE_STACK_CHECKER_REPORTER) + #error "Stack checker is disabled but a custom reporter is configured" +#endif + #ifdef CONFIGURE_STACK_CHECKER_ENABLED #include #endif -#ifdef CONFIGURE_STACK_CHECKER_ENABLED - #ifdef CONFIGURE_STACK_CHECKER_REPORTER - const Stack_checker_Reporter_handler Stack_checker_Reporter = - CONFIGURE_STACK_CHECKER_REPORTER; - - #else - const Stack_checker_Reporter_handler Stack_checker_Reporter = - rtems_stack_checker_reporter_quiet; - - #endif -#endif - -#if !defined(CONFIGURE_STACK_CHECKER_ENABLED) && defined(CONFIGURE_STACK_CHECKER_REPORTER) -#error "Stack checker is disabled but a custom reporter is configured" -#endif - #ifdef CONFIGURE_EXCEPTION_TO_SIGNAL_MAPPING #include #endif @@ -218,6 +211,16 @@ extern "C" { ); #endif +#ifdef CONFIGURE_STACK_CHECKER_ENABLED + #ifdef CONFIGURE_STACK_CHECKER_REPORTER + const Stack_checker_Reporter_handler Stack_checker_Reporter = + CONFIGURE_STACK_CHECKER_REPORTER; + #else + const Stack_checker_Reporter_handler Stack_checker_Reporter = + rtems_stack_checker_reporter_quiet; + #endif +#endif + #ifdef __cplusplus } #endif