Merge remote-tracking branch 'origin/fix-circular-dependency-protection' into develop_integration_2020_w22

2020-05-28 12:56:05 +02:00
parent e5eca66ad5 11783e755a
commit a0ab138a5e
56 changed files with 226 additions and 122 deletions
@@ -1,5 +1,5 @@
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
+#ifndef __COMMON_UTILS_T_TRACER_CONFIG__H__
+#define __COMMON_UTILS_T_TRACER_CONFIG__H__

 void clear_remote_config(void);
 void append_received_config_chunk(char *buf, int length);
@@ -7,4 +7,4 @@ void load_config_file(char *filename);
 void verify_config(void);
 void get_local_config(char **txt, int *len);

-#endif /* _CONFIG_H_ */
+#endif /* __COMMON_UTILS_T_TRACER_CONFIG__H__ */
@@ -33,6 +33,9 @@
 * SUCH DAMAGE
 */

+#ifndef __COMMON_UTILS_T_TRACER_PACKET_MAC_LTE__H__
+#define __COMMON_UTILS_T_TRACER_PACKET_MAC_LTE__H__
+
 //#include "ws_symbol_export.h"

 /* radioType */
@@ -139,3 +142,4 @@
   continues until the end of the frame) */
 #define MAC_LTE_PAYLOAD_TAG 0x01

+#endif