Make it compile on 15.10 (problem with gcc-xml not resolved, may be do as in openair-cn: disable it, it is only needed for ITTI ANALYZER)
This commit is contained in:
@@ -1110,7 +1110,6 @@ add_library(CN_UTILS
|
|||||||
${OPENAIR3_DIR}/UTILS/conversions.c
|
${OPENAIR3_DIR}/UTILS/conversions.c
|
||||||
${OPENAIR3_DIR}/UTILS/enum_string.c
|
${OPENAIR3_DIR}/UTILS/enum_string.c
|
||||||
${OPENAIR3_DIR}/UTILS/log.c
|
${OPENAIR3_DIR}/UTILS/log.c
|
||||||
${OPENAIR3_DIR}/UTILS/mme_config.c
|
|
||||||
${OPENAIR3_DIR}/UTILS/mcc_mnc_itu.c
|
${OPENAIR3_DIR}/UTILS/mcc_mnc_itu.c
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,19 @@ Description Contains global common definitions
|
|||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
typedef signed char boolean_t;
|
||||||
|
|
||||||
|
#if !defined(TRUE)
|
||||||
|
#define TRUE (boolean_t)0x01
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(FALSE)
|
||||||
|
#define FALSE (boolean_t)0x00
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define BOOL_NOT(b) (b^TRUE)
|
||||||
|
|
||||||
#define NAS_UE_ID_FMT "0x%06x"
|
#define NAS_UE_ID_FMT "0x%06x"
|
||||||
|
|
||||||
@@ -59,13 +71,6 @@ Description Contains global common definitions
|
|||||||
#define RETURNok (0)
|
#define RETURNok (0)
|
||||||
#define RETURNerror (-1)
|
#define RETURNerror (-1)
|
||||||
|
|
||||||
#ifndef FALSE
|
|
||||||
#define FALSE (0)
|
|
||||||
#endif
|
|
||||||
#ifndef TRUE
|
|
||||||
#define TRUE (1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Name of the environment variable which defines the default directory
|
* Name of the environment variable which defines the default directory
|
||||||
* where the NAS application is executed and where are located files
|
* where the NAS application is executed and where are located files
|
||||||
|
|||||||
@@ -60,6 +60,8 @@
|
|||||||
# include "DRB-ToAddModList.h"
|
# include "DRB-ToAddModList.h"
|
||||||
# include "SRB-ToAddMod.h"
|
# include "SRB-ToAddMod.h"
|
||||||
# include "SRB-ToAddModList.h"
|
# include "SRB-ToAddModList.h"
|
||||||
|
# include "DRB-ToReleaseList.h"
|
||||||
|
|
||||||
#ifdef Rel10
|
#ifdef Rel10
|
||||||
#include "PMCH-InfoList-r9.h"
|
#include "PMCH-InfoList-r9.h"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -51,10 +51,6 @@
|
|||||||
#include "UTIL/OPT/opt.h"
|
#include "UTIL/OPT/opt.h"
|
||||||
/*----------------------------------------------------------------------------*/
|
/*----------------------------------------------------------------------------*/
|
||||||
|
|
||||||
#ifndef HAVE_STRNDUP
|
|
||||||
char * strndup (const char *s, size_t size);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int oai_emulation_; /*!< \brief indicating that the parsing position is now within OAI_Emulation_*/
|
static int oai_emulation_; /*!< \brief indicating that the parsing position is now within OAI_Emulation_*/
|
||||||
|
|
||||||
static int environment_system_config_; /*!< \brief indicating that the parsing position is now within Envi_Config_*/
|
static int environment_system_config_; /*!< \brief indicating that the parsing position is now within Envi_Config_*/
|
||||||
|
|||||||
Reference in New Issue
Block a user