From c62b54a030ef77591df36d353de544a2d95ff28c Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Fri, 27 Jan 2017 15:49:45 +0100
Subject: [PATCH] remove duplicated definitions
I am not sure if it's the right way to solve the
problem, so I keep the definitions here and
put them inside #if 0 #endif
---
openair3/NAS/COMMON/commonDef.h | 2 ++
openair3/NAS/COMMON/networkDef.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/openair3/NAS/COMMON/commonDef.h b/openair3/NAS/COMMON/commonDef.h
index 64216b0094..84d97fc4a8 100644
--- a/openair3/NAS/COMMON/commonDef.h
+++ b/openair3/NAS/COMMON/commonDef.h
@@ -314,6 +314,7 @@ typedef struct {
*/
#define TAI_LIST_T(SIZE) struct {Byte_t n_tais; tai_t tai[SIZE];}
+#if 0
/*
* User notification callback, executed whenever a change of data with
* respect of network information (e.g. network registration and/or
@@ -322,6 +323,7 @@ typedef struct {
*/
typedef int (*emm_indication_callback_t) (Stat_t, tac_t, ci_t, AcT_t,
const char*, size_t);
+#endif
typedef enum eps_protocol_discriminator_e {
/* Protocol discriminator identifier for EPS Mobility Management */
diff --git a/openair3/NAS/COMMON/networkDef.h b/openair3/NAS/COMMON/networkDef.h
index 46716bee24..e3e8e1f08b 100644
--- a/openair3/NAS/COMMON/networkDef.h
+++ b/openair3/NAS/COMMON/networkDef.h
@@ -260,12 +260,14 @@ typedef struct {
network_pkf_t* pkf[NET_PACKET_FILTER_MAX];
} network_tft_t;
+#if 0
/*
* User notification callback, executed whenever a change of status with
* respect of PDN connection or EPS bearer context is notified by the EPS
* Session Management sublayer
*/
typedef int (*esm_indication_callback_t) (int, network_pdn_state_t);
+#endif
/****************************************************************************/
/******************** G L O B A L V A R I A B L E S ********************/
--
GitLab