From 157ebfdcadc6766e7579d14ca0b7e78198241db2 Mon Sep 17 00:00:00 2001 From: Henrik Stickann <4376396-Mithradir@users.noreply.gitlab.com> Date: Sun, 10 Apr 2022 20:09:52 +0200 Subject: [PATCH] Rename concat macro and add usage warning override --- include/sta/os2/easy_config.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/sta/os2/easy_config.hpp b/include/sta/os2/easy_config.hpp index 0993087..0e6ff52 100644 --- a/include/sta/os2/easy_config.hpp +++ b/include/sta/os2/easy_config.hpp @@ -7,9 +7,9 @@ #ifndef STA_OS2_EASY_CONFIG_HPP #define STA_OS2_EASY_CONFIG_HPP -#ifndef STA_CONFIG_HPP +#if !defined(STA_CONFIG_HPP) && !defined(STA_OS2_EASY_CONFIG_NO_WARNING) #warning "Intended for use in " -#endif // STA_CONFIG_HPP +#endif // !STA_CONFIG_HPP && !STA_OS2_EASY_CONFIG_NO_WARNING #ifdef STA_OS2_SYSTEM_TASKS_ENABLE @@ -21,10 +21,11 @@ #endif // STA_OS2_SYSTEM_TASKS_ENABLE -#define STA_OS2_MAKE_NAME(prefix, suffix) prefix ## suffix -#define STA_OS2_MAKE_HANDLE_NAME(x) STA_OS2_MAKE_NAME(x, Handle) -#define STA_OS2_MAKE_CALLBACK_NAME(x) STA_OS2_MAKE_NAME(x, Callback) -#define STA_OS2_MAKE_TASK_NAME(x) STA_OS2_MAKE_NAME(x, Task) +#define _STA_OS2_CONCAT(a, b) a ## b + +#define STA_OS2_MAKE_HANDLE_NAME(name) _STA_OS2_CONCAT(name, Handle) +#define STA_OS2_MAKE_CALLBACK_NAME(name) _STA_OS2_CONCAT(name, Callback) +#define STA_OS2_MAKE_TASK_NAME(name) _STA_OS2_CONCAT(name, Task) // Use common base name for watchdog timer handle and callback #ifdef STA_OS2_WATCHDOG_TIMER_NAME