From 6dc157208a3a40c4a3c6e7c5e17ca4263c7d4afb Mon Sep 17 00:00:00 2001 From: BytesGalore Date: Fri, 10 Oct 2014 08:03:06 +0200 Subject: [PATCH] c++: tests: add `extern "C"` in header files, i.e. only present in `./unittests` --- tests/unittests/embunit/embUnit/HelperMacro.h | 8 ++++++++ tests/unittests/embunit/embUnit/RepeatedTest.h | 8 ++++++++ tests/unittests/embunit/embUnit/Test.h | 8 ++++++++ tests/unittests/embunit/embUnit/TestCaller.h | 8 ++++++++ tests/unittests/embunit/embUnit/TestCase.h | 8 ++++++++ tests/unittests/embunit/embUnit/TestListener.h | 8 ++++++++ tests/unittests/embunit/embUnit/TestSuite.h | 8 ++++++++ tests/unittests/embunit/embUnit/config.h | 8 ++++++++ tests/unittests/embunit/embUnit/embUnit.h | 8 ++++++++ tests/unittests/embunit/textui/CompilerOutputter.h | 8 ++++++++ tests/unittests/embunit/textui/Outputter.h | 8 ++++++++ tests/unittests/embunit/textui/TextOutputter.h | 8 ++++++++ tests/unittests/embunit/textui/TextUIRunner.h | 8 ++++++++ tests/unittests/embunit/textui/XMLOutputter.h | 8 ++++++++ tests/unittests/map.h | 8 ++++++++ tests/unittests/tests-core/tests-core.h | 8 ++++++++ tests/unittests/tests-lib/tests-lib.h | 8 ++++++++ tests/unittests/tests-pktbuf/tests-pktbuf.h | 8 ++++++++ tests/unittests/tests-pktqueue/tests-pktqueue.h | 9 +++++++++ tests/unittests/tests-timex/tests-timex.h | 8 ++++++++ tests/unittests/unittests.h | 8 ++++++++ 21 files changed, 169 insertions(+) diff --git a/tests/unittests/embunit/embUnit/HelperMacro.h b/tests/unittests/embunit/embUnit/HelperMacro.h index 3445f10850..2192405e02 100644 --- a/tests/unittests/embunit/embUnit/HelperMacro.h +++ b/tests/unittests/embunit/embUnit/HelperMacro.h @@ -35,6 +35,10 @@ #ifndef __HELPERMACRO_H__ #define __HELPERMACRO_H__ +#ifdef __cplusplus +extern "C" { +#endif + #define EMB_UNIT_TESTCASE(ca,sup,tdw,run) \ static const TestCase ca = new_TestCase(#ca,sup,tdw,run) @@ -56,4 +60,8 @@ #define EMB_UNIT_REPEATEDTEST(repeater,test,tmrp) \ static const RepeatedTest repeater = new_RepeatedTest(test,tmrp) +#ifdef __cplusplus +} +#endif + #endif/*__HELPERMACRO_H__*/ diff --git a/tests/unittests/embunit/embUnit/RepeatedTest.h b/tests/unittests/embunit/embUnit/RepeatedTest.h index 00af8e1e0f..9bc6fd42b9 100644 --- a/tests/unittests/embunit/embUnit/RepeatedTest.h +++ b/tests/unittests/embunit/embUnit/RepeatedTest.h @@ -35,6 +35,10 @@ #ifndef __REPEATEDTEST_H__ #define __REPEATEDTEST_H__ +#ifdef __cplusplus +extern "C" { +#endif + typedef struct __RepeatedTest RepeatedTest; typedef struct __RepeatedTest* RepeatedTestRef; /*downward compatible*/ @@ -53,4 +57,8 @@ extern const TestImplement RepeatedTestImplement; tmrp,\ } +#ifdef __cplusplus +} +#endif + #endif/*__REPEATEDTEST_H__*/ diff --git a/tests/unittests/embunit/embUnit/Test.h b/tests/unittests/embunit/embUnit/Test.h index d0ec0d4086..39a528392f 100644 --- a/tests/unittests/embunit/embUnit/Test.h +++ b/tests/unittests/embunit/embUnit/Test.h @@ -35,6 +35,10 @@ #ifndef __TEST_H__ #define __TEST_H__ +#ifdef __cplusplus +extern "C" { +#endif + typedef struct __TestResult TestResult; typedef struct __TestResult* TestResultRef;/*downward compatible*/ @@ -62,4 +66,8 @@ struct __Test { #define Test_run(s,r) ((Test*)s)->isa->run(s,r) #define Test_countTestCases(s) ((Test*)s)->isa->countTestCases(s) +#ifdef __cplusplus +} +#endif + #endif/*__TEST_H__*/ diff --git a/tests/unittests/embunit/embUnit/TestCaller.h b/tests/unittests/embunit/embUnit/TestCaller.h index 0b5d9ce517..7661bcb235 100644 --- a/tests/unittests/embunit/embUnit/TestCaller.h +++ b/tests/unittests/embunit/embUnit/TestCaller.h @@ -35,6 +35,10 @@ #ifndef __TESTCALLER_H__ #define __TESTCALLER_H__ +#ifdef __cplusplus +extern "C" { +#endif + typedef struct __TestFixture TestFixture; typedef struct __TestFixture* TestFixtureRef;/*downward compatible*/ @@ -69,4 +73,8 @@ extern const TestImplement TestCallerImplement; fixtuers,\ } +#ifdef __cplusplus +} +#endif + #endif/*__TESTCALLER_H__*/ diff --git a/tests/unittests/embunit/embUnit/TestCase.h b/tests/unittests/embunit/embUnit/TestCase.h index c52bfdddac..fd1d8ffeb7 100644 --- a/tests/unittests/embunit/embUnit/TestCase.h +++ b/tests/unittests/embunit/embUnit/TestCase.h @@ -35,6 +35,10 @@ #ifndef __TESTCASE_H__ #define __TESTCASE_H__ +#ifdef __cplusplus +extern "C" { +#endif + typedef struct __TestCase TestCase; typedef struct __TestCase* TestCaseRef;/*compatible embUnit1.0*/ @@ -57,4 +61,8 @@ extern const TestImplement TestCaseImplement; runTest,\ } +#ifdef __cplusplus +} +#endif + #endif/*__TESTCASE_H__*/ diff --git a/tests/unittests/embunit/embUnit/TestListener.h b/tests/unittests/embunit/embUnit/TestListener.h index 5bd2518f58..cb64360ee8 100644 --- a/tests/unittests/embunit/embUnit/TestListener.h +++ b/tests/unittests/embunit/embUnit/TestListener.h @@ -35,6 +35,10 @@ #ifndef __TESTLISTENER_H__ #define __TESTLISTENER_H__ +#ifdef __cplusplus +extern "C" { +#endif + typedef struct __TestListnerImplement TestListnerImplement; typedef struct __TestListnerImplement* TestListnerImplementRef;/*downward compatible*/ @@ -59,4 +63,8 @@ struct __TestListner { #define TestListner_endTest(s,t) ((TestListner*)s)->isa->endTest(s,t) #define TestListner_addFailure(s,t,m,l,f) ((TestListner*)s)->isa->addFailure(s,t,m,l,f) +#ifdef __cplusplus +} +#endif + #endif/*__TESTLISTENER_H__*/ diff --git a/tests/unittests/embunit/embUnit/TestSuite.h b/tests/unittests/embunit/embUnit/TestSuite.h index 3eae31584f..fb63e3c63e 100644 --- a/tests/unittests/embunit/embUnit/TestSuite.h +++ b/tests/unittests/embunit/embUnit/TestSuite.h @@ -35,6 +35,10 @@ #ifndef __TESTSUITE_H__ #define __TESTSUITE_H__ +#ifdef __cplusplus +extern "C" { +#endif + typedef struct __TestSuite TestSuite; typedef struct __TestSuite* TestSuiteRef;/*downward compatible*/ @@ -55,4 +59,8 @@ extern const TestImplement TestSuiteImplement; tests,\ } +#ifdef __cplusplus +} +#endif + #endif/*__TESTSUITE_H__*/ diff --git a/tests/unittests/embunit/embUnit/config.h b/tests/unittests/embunit/embUnit/config.h index 99fa7b6ca5..d9c3adb4f3 100644 --- a/tests/unittests/embunit/embUnit/config.h +++ b/tests/unittests/embunit/embUnit/config.h @@ -35,6 +35,10 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ +#ifdef __cplusplus +extern "C" { +#endif + /* #define NO_STDIO_PRINTF*/ #ifdef NO_STDIO_PRINTF extern void stdimpl_print(const char *string); @@ -45,4 +49,8 @@ #define ASSERT_STRING_BUFFER_MAX 64 +#ifdef __cplusplus +} +#endif + #endif/*__CONFIG_H__*/ diff --git a/tests/unittests/embunit/embUnit/embUnit.h b/tests/unittests/embunit/embUnit/embUnit.h index 648c445cc1..5c8eb6aa2e 100644 --- a/tests/unittests/embunit/embUnit/embUnit.h +++ b/tests/unittests/embunit/embUnit/embUnit.h @@ -47,4 +47,12 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} +#endif + #endif/*__EMBUNIT_H__*/ diff --git a/tests/unittests/embunit/textui/CompilerOutputter.h b/tests/unittests/embunit/textui/CompilerOutputter.h index a63e814b70..ecc1d417da 100644 --- a/tests/unittests/embunit/textui/CompilerOutputter.h +++ b/tests/unittests/embunit/textui/CompilerOutputter.h @@ -37,6 +37,14 @@ #include "Outputter.h" +#ifdef __cplusplus +extern "C" { +#endif + OutputterRef CompilerOutputter_outputter(void); +#ifdef __cplusplus +} +#endif + #endif/*__COMPILEROUTPUTTER_H__*/ diff --git a/tests/unittests/embunit/textui/Outputter.h b/tests/unittests/embunit/textui/Outputter.h index 10873cf06c..e5fc8aa830 100644 --- a/tests/unittests/embunit/textui/Outputter.h +++ b/tests/unittests/embunit/textui/Outputter.h @@ -37,6 +37,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + typedef struct __OutputterImplement OutputterImplement; typedef struct __OutputterImplement* OutputterImplementRef; @@ -71,4 +75,8 @@ struct __Outputter { #define Outputter_printFailure(o,t,m,l,f,c) (o)->isa->printFailure(o,t,m,l,f,c) #define Outputter_printStatistics(o,r) (o)->isa->printStatistics(o,r) +#ifdef __cplusplus +} +#endif + #endif/*__OUTPUTTER_H__*/ diff --git a/tests/unittests/embunit/textui/TextOutputter.h b/tests/unittests/embunit/textui/TextOutputter.h index a1d56040ea..1a8fd69cf5 100644 --- a/tests/unittests/embunit/textui/TextOutputter.h +++ b/tests/unittests/embunit/textui/TextOutputter.h @@ -37,6 +37,14 @@ #include "Outputter.h" +#ifdef __cplusplus +extern "C" { +#endif + OutputterRef TextOutputter_outputter(void); +#ifdef __cplusplus +} +#endif + #endif/*__TEXTOUTPUTTER_H__*/ diff --git a/tests/unittests/embunit/textui/TextUIRunner.h b/tests/unittests/embunit/textui/TextUIRunner.h index afae466d30..dc100fb4a0 100644 --- a/tests/unittests/embunit/textui/TextUIRunner.h +++ b/tests/unittests/embunit/textui/TextUIRunner.h @@ -39,10 +39,18 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + void TextUIRunner_setOutputter(OutputterRef outputter); void TextUIRunner_startWithOutputter(OutputterRef outputter); void TextUIRunner_start(void); void TextUIRunner_runTest(TestRef test); void TextUIRunner_end(void); +#ifdef __cplusplus +} +#endif + #endif/*__TEXTUIRUNNER_H__*/ diff --git a/tests/unittests/embunit/textui/XMLOutputter.h b/tests/unittests/embunit/textui/XMLOutputter.h index 3168e0e2b0..9f82fff4db 100644 --- a/tests/unittests/embunit/textui/XMLOutputter.h +++ b/tests/unittests/embunit/textui/XMLOutputter.h @@ -37,7 +37,15 @@ #include "Outputter.h" +#ifdef __cplusplus +extern "C" { +#endif + void XMLOutputter_setStyleSheet(char *style); OutputterRef XMLOutputter_outputter(void); +#ifdef __cplusplus +} +#endif + #endif/*__XMLOUTPUTTER_H__*/ diff --git a/tests/unittests/map.h b/tests/unittests/map.h index 452ae0348d..f813b86be7 100644 --- a/tests/unittests/map.h +++ b/tests/unittests/map.h @@ -29,6 +29,10 @@ #ifndef MAP_H_INCLUDED #define MAP_H_INCLUDED +#ifdef __cplusplus +extern "C" { +#endif + #define EVAL0(...) __VA_ARGS__ #define EVAL1(...) EVAL0 (EVAL0 (EVAL0 (__VA_ARGS__))) #define EVAL2(...) EVAL1 (EVAL1 (EVAL1 (__VA_ARGS__))) @@ -48,4 +52,8 @@ #define MAP1(f, x, peek, ...) f(x) MAP_NEXT (peek, MAP0) (f, peek, __VA_ARGS__) #define MAP(f, ...) EVAL (MAP1 (f, __VA_ARGS__, (), 0)) +#ifdef __cplusplus +} +#endif + #endif diff --git a/tests/unittests/tests-core/tests-core.h b/tests/unittests/tests-core/tests-core.h index 9733337ec3..613291e0c3 100644 --- a/tests/unittests/tests-core/tests-core.h +++ b/tests/unittests/tests-core/tests-core.h @@ -20,6 +20,10 @@ #include "../unittests.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief The entry point of this test suite. */ @@ -74,5 +78,9 @@ Test *tests_core_priority_queue_tests(void); */ Test *tests_core_byteorder_tests(void); +#ifdef __cplusplus +} +#endif + #endif /* __TESTS_CORE_H_ */ /** @} */ diff --git a/tests/unittests/tests-lib/tests-lib.h b/tests/unittests/tests-lib/tests-lib.h index bd4ec2cecc..74ff19c62d 100644 --- a/tests/unittests/tests-lib/tests-lib.h +++ b/tests/unittests/tests-lib/tests-lib.h @@ -20,6 +20,10 @@ #include "../unittests.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief The entry point of this test suite. */ @@ -32,5 +36,9 @@ void tests_lib(void); */ Test *tests_lib_ringbuffer_tests(void); +#ifdef __cplusplus +} +#endif + #endif /* __TESTS_CORE_H_ */ /** @} */ diff --git a/tests/unittests/tests-pktbuf/tests-pktbuf.h b/tests/unittests/tests-pktbuf/tests-pktbuf.h index 6248328c3b..cdfab7b9f0 100644 --- a/tests/unittests/tests-pktbuf/tests-pktbuf.h +++ b/tests/unittests/tests-pktbuf/tests-pktbuf.h @@ -20,10 +20,18 @@ #include "../unittests.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief The entry point of this test suite. */ void tests_pktbuf(void); +#ifdef __cplusplus +} +#endif + #endif /* __TESTS_PKTBUF_H_ */ /** @} */ diff --git a/tests/unittests/tests-pktqueue/tests-pktqueue.h b/tests/unittests/tests-pktqueue/tests-pktqueue.h index 340ba3f657..b48260d6ec 100644 --- a/tests/unittests/tests-pktqueue/tests-pktqueue.h +++ b/tests/unittests/tests-pktqueue/tests-pktqueue.h @@ -20,10 +20,19 @@ #include "../unittests.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief The entry point of this test suite. */ void tests_pktqueue(void); + +#ifdef __cplusplus +} +#endif + #endif /* __TESTS_PKTQUEUE_H_ */ /** @} */ diff --git a/tests/unittests/tests-timex/tests-timex.h b/tests/unittests/tests-timex/tests-timex.h index 5fac2fded3..50274e8880 100644 --- a/tests/unittests/tests-timex/tests-timex.h +++ b/tests/unittests/tests-timex/tests-timex.h @@ -21,6 +21,10 @@ #include "../unittests.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief The entry point of this test suite. */ @@ -33,5 +37,9 @@ void tests_timex(void); */ Test *tests_timex_tests(void); +#ifdef __cplusplus +} +#endif + #endif /* __TESTS_TIMEX_H_ */ /** @} */ diff --git a/tests/unittests/unittests.h b/tests/unittests/unittests.h index a185f46642..f88e90e612 100644 --- a/tests/unittests/unittests.h +++ b/tests/unittests/unittests.h @@ -19,6 +19,10 @@ #ifndef __UNITTESTS__H #define __UNITTESTS__H +#ifdef __cplusplus +extern "C" { +#endif + #include "embUnit/embUnit.h" #ifdef OUTPUT @@ -48,4 +52,8 @@ # define TESTS_END() TestRunner_end() #endif +#ifdef __cplusplus +} +#endif + #endif