Merge pull request #7761 from aashishc1988/master

ifndef some macros to allow overriding during compilation
2018-08-27 10:27:49 -05:00 · 2018-08-27 10:27:49 -05:00 · bf2da4859c
parent a24cecfc94 1cdef09698
commit bf2da4859c
2 changed files with 8 additions and 0 deletions
--- 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
--- a/features/unsupported/tests/mbed/env/test_env.h
+++ b/features/unsupported/tests/mbed/env/test_env.h
@ -4,8 +4,12 @@
 #include <stdio.h>
 #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;