From 1cdef09698486d7f2593885f25be6f55982530d6 Mon Sep 17 00:00:00 2001 From: Aashish chaddha Date: Wed, 8 Aug 2018 15:23:19 -0500 Subject: [PATCH] ifndef some macros to allow overriding during compilation or be able to get some warnings during redefinition --- .../frameworks/greentea-client/greentea-client/test_env.h | 4 ++++ features/unsupported/tests/mbed/env/test_env.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/features/frameworks/greentea-client/greentea-client/test_env.h b/features/frameworks/greentea-client/greentea-client/test_env.h index 6aa2617c57..672874d29a 100644 --- a/features/frameworks/greentea-client/greentea-client/test_env.h +++ b/features/frameworks/greentea-client/greentea-client/test_env.h @@ -33,8 +33,12 @@ /** * Auxilary macros */ +#ifndef NL #define NL "\n" +#endif +#ifndef RCNL #define RCNL "\r\n" +#endif /** * Auxilary macros to keep mbed-drivers compatibility with utest before greentea-client diff --git a/features/unsupported/tests/mbed/env/test_env.h b/features/unsupported/tests/mbed/env/test_env.h index bfb2c44d2d..6a390dc551 100644 --- a/features/unsupported/tests/mbed/env/test_env.h +++ b/features/unsupported/tests/mbed/env/test_env.h @@ -4,8 +4,12 @@ #include #include "mbed.h" +#ifndef NL #define NL "\n" +#endif +#ifndef RCNL #define RCNL "\r\n" +#endif // Const strings used in test_end extern const char* TEST_ENV_START;