Merge branch 'develop' into NR_RRC_harq_hacks

openair2/COMMON/s1ap_messages_types.h

@@ -79,7 +79,6 @@
  * the key length is 32 bytes (256 bits)
  */
 #define SECURITY_KEY_LENGTH 32
-#ifndef OCP_FRAMEWORK
 typedef enum cell_type_e {
   CELL_MACRO_ENB,
   CELL_HOME_ENB,
@@ -111,7 +110,6 @@ typedef enum cn_domain_s {
   CN_DOMAIN_PS = 1,
   CN_DOMAIN_CS = 2
 } cn_domain_t;
-#endif
 
 typedef struct net_ip_address_s {
   unsigned ipv4:1;
@@ -127,7 +125,6 @@ typedef struct ambr_s {
   bitrate_t br_dl;
 } ambr_t;
 
-#ifndef OCP_FRAMEWORK
 typedef enum priority_level_s {
   PRIORITY_LEVEL_SPARE       = 0,
   PRIORITY_LEVEL_HIGHEST     = 1,
@@ -146,7 +143,6 @@ typedef enum pre_emp_vulnerability_e {
   PRE_EMPTION_VULNERABILITY_DISABLED = 1,
   PRE_EMPTION_VULNERABILITY_MAX,
 } pre_emp_vulnerability_t;
-#endif
 
 typedef struct allocation_retention_priority_s {
   priority_level_t        priority_level;