Merge greentea-client/test_env_c.h into greentea-client/test_env.h

Author: Azim Khan

features/frameworks/greentea-client/greentea-client/test_env.h

@@ -21,16 +21,14 @@
 #ifndef GREENTEA_CLIENT_TEST_ENV_H_
 #define GREENTEA_CLIENT_TEST_ENV_H_
 
+#ifdef __cplusplus
 #ifdef YOTTA_GREENTEA_CLIENT_VERSION_STRING
 #define MBED_GREENTEA_CLIENT_VERSION_STRING YOTTA_GREENTEA_CLIENT_VERSION_STRING
 #else
 #define MBED_GREENTEA_CLIENT_VERSION_STRING "1.3.0"
 #endif
 
 #include <stdio.h>
-extern "C" {
-#include "test_env_c.h"
-}
 
 /**
  *  Auxilary macros
@@ -106,6 +104,25 @@ void greentea_notify_coverage_start(const char *path);
 void greentea_notify_coverage_end();
 #endif  // MBED_CFG_DEBUG_OPTIONS_COVERAGE
 
+#endif  // __cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  Greentea-client C API
+ */
+void GREENTEA_SETUP(const int timeout, const char * host_test);
+void greentea_send_kv(const char * key, const char * val);
+int greentea_parse_kv(char * key, char * val,
+                        const int key_len, const int val_len);
+int greentea_getc();
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif  // GREENTEA_CLIENT_TEST_ENV_H_
 
 /** @}*/