Merge remote-tracking branch 'origin/migrate_rel10_rel14_to_make_version' into develop

2018-06-18 16:25:39 +02:00
parent 9adf1999db f097cca7a5
commit d579a74e54
38 changed files with 168 additions and 166 deletions
@@ -127,7 +127,7 @@ void phy_procedures_eNB_S_RX(PHY_VARS_eNB *phy_vars_eNB,eNB_rxtx_proc_t *proc);
  @param phy_vars_eNB Pointer to eNB variables on which to act
  @param br_flag indicator for eMTC PRACH
 */
-#ifdef Rel14
+#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
 void prach_procedures(PHY_VARS_eNB *eNB,
 		      int br_flag);
 #else