Merge branch 'develop' into NR_RRC_PRACH_procedures

Conflicts:
	executables/nr-ue.c
	openair1/PHY/NR_REFSIG/dmrs_nr.c
	openair1/PHY/NR_TRANSPORT/nr_prach.c
	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
	openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
	openair1/SIMULATION/NR_PHY/prachsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

common/utils/nr/nr_common.h

@@ -30,6 +30,9 @@
  * \warning
  */
 
+#ifndef __COMMON_UTILS_NR_NR_COMMON__H__
+#define __COMMON_UTILS_NR_NR_COMMON__H__
+
 #include <stdint.h>
 #include "assertions.h"
 
@@ -63,3 +66,5 @@ void SLIV2SL(int SLIV,int *S,int *L);
 #define max(a,b) cmax(a,b)
 #define min(a,b) cmin(a,b)
 #endif
+
+#endif