BUILD: fix compilation warning and circular dependency protection on header files

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -543,7 +543,7 @@ void nr_generate_Msg2(module_id_t module_idP,
                       sub_frame_t slotP){
 
   int UE_id = 0, dci_formats[2], rnti_types[2], mcsIndex;
-  int startSymbolAndLength = 0, StartSymbolIndex = -1, NrOfSymbols = 14, StartSymbolIndex_tmp, NrOfSymbols_tmp, x_Overhead, time_domain_assignment;
+  int startSymbolAndLength = 0, StartSymbolIndex = -1, NrOfSymbols = 14, StartSymbolIndex_tmp, NrOfSymbols_tmp, x_Overhead, time_domain_assignment = 0;
   gNB_MAC_INST                      *nr_mac = RC.nrmac[module_idP];
   NR_COMMON_channels_t                  *cc = &nr_mac->common_channels[0];
   NR_RA_t                               *ra = &cc->ra[0];

openair2/LAYER2/nr_rlc/asn1_utils.h

@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-#ifndef _ASN1_UTILS_H_
-#define _ASN1_UTILS_H_
+#ifndef _OPENAIR2_LAYER2_NR_RLC_ASN1_UTILS_H_
+#define _OPENAIR2_LAYER2_NR_RLC_ASN1_UTILS_H_
 
 int decode_t_reassembly(int v);
 int decode_t_status_prohibit(int v);
@@ -31,4 +31,4 @@ int decode_max_retx_threshold(int v);
 int decode_sn_field_length_um(int v);
 int decode_sn_field_length_am(int v);
 
-#endif /* _ASN1_UTILS_H_ */
+#endif /* _OPENAIR2_LAYER2_NR_RLC_ASN1_UTILS_H_ */

openair2/LAYER2/rlc_v2/asn1_utils.h

@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-#ifndef _ASN1_UTILS_H_
-#define _ASN1_UTILS_H_
+#ifndef _OPENAIR2_LAYER2_RLC_V2_ASN1_UTILS_H_
+#define _OPENAIR2_LAYER2_RLC_V2_ASN1_UTILS_H_
 
 int decode_t_reordering(int v);
 int decode_t_status_prohibit(int v);
@@ -30,4 +30,4 @@ int decode_poll_byte(int v);
 int decode_max_retx_threshold(int v);
 int decode_sn_field_length(int v);
 
-#endif /* _ASN1_UTILS_H_ */
+#endif /* _OPENAIR2_LAYER2_RLC_V2_ASN1_UTILS_H_ */

targets/ARCH/ETHERNET/benetel/4g/low.h

@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-#ifndef _BENETEL_LOW_H_
-#define _BENETEL_LOW_H_
+#ifndef _BENETEL_4G_LOW_H_
+#define _BENETEL_4G_LOW_H_
 
 #include "shared_buffers.h"
 
@@ -46,4 +46,4 @@ void *benetel_start(char *ifname, shared_buffers *buffers, char *dpdk_main_comma
 void store_ul(benetel_t *bs, ul_packet_t *ul);
 void store_prach(benetel_t *bs, int frame, int subframe, void *data);
 
-#endif /* _BENETEL_LOW_H_ */
+#endif /* _BENETEL_4G_LOW_H_ */

targets/ARCH/ETHERNET/benetel/4g/shared_buffers.h

@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-#ifndef _SHARED_BUFFERS_H_
-#define _SHARED_BUFFERS_H_
+#ifndef _BENETEL_4G_SHARED_BUFFERS_H_
+#define _BENETEL_4G_SHARED_BUFFERS_H_
 
 #include <pthread.h>
 #include <stdint.h>
@@ -57,4 +57,4 @@ void unlock_ul_buffer(shared_buffers *s, int subframe);
 void wait_ul_buffer(shared_buffers *s, int subframe);
 void signal_ul_buffer(shared_buffers *s, int subframe);
 
-#endif /* _SHARED_BUFFERS_H_ */
+#endif /* _BENETEL_4G_SHARED_BUFFERS_H_ */

targets/ARCH/ETHERNET/benetel/5g/low.h

@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-#ifndef _BENETEL_LOW_H_
-#define _BENETEL_LOW_H_
+#ifndef _BENETEL_5G_LOW_H_
+#define _BENETEL_5G_LOW_H_
 
 #include "shared_buffers.h"
 
@@ -45,4 +45,4 @@ void *benetel_start(char *ifname, shared_buffers *buffers, char *dpdk_main_comma
 void store_ul(benetel_t *bs, ul_packet_t *ul);
 void store_prach(benetel_t *bs, int frame, int slot, void *data);
 
-#endif /* _BENETEL_LOW_H_ */
+#endif /* _BENETEL_5G_LOW_H_ */

targets/ARCH/ETHERNET/benetel/5g/shared_buffers.h

@@ -19,8 +19,8 @@
  *      contact@openairinterface.org
  */
 
-#ifndef _SHARED_BUFFERS_H_
-#define _SHARED_BUFFERS_H_
+#ifndef _BENETEL_5G_SHARED_BUFFERS_H_
+#define _BENETEL_5G_SHARED_BUFFERS_H_
 
 #include <pthread.h>
 #include <stdint.h>
@@ -57,4 +57,4 @@ void unlock_ul_buffer(shared_buffers *s, int slot);
 void wait_ul_buffer(shared_buffers *s, int slot);
 void signal_ul_buffer(shared_buffers *s, int slot);
 
-#endif /* _SHARED_BUFFERS_H_ */
+#endif /* _BENETEL_5G_SHARED_BUFFERS_H_ */