From c32e5544e2339d6fd683247d290c7680cd043b8f Mon Sep 17 00:00:00 2001
From: gauthier <lionel.gauthier@eurecom.fr>
Date: Sat, 20 Feb 2016 18:20:44 +0100
Subject: [PATCH] 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)
---
cmake_targets/CMakeLists.txt | 1 -
openair2/COMMON/commonDef.h | 19 ++++++++++++-------
openair2/LAYER2/RLC/rlc.h | 2 ++
openair2/UTIL/OCG/OCG_parse_XML.c | 4 ----
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index a88eb69991..1c8f3d221e 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -1110,7 +1110,6 @@ add_library(CN_UTILS
${OPENAIR3_DIR}/UTILS/conversions.c
${OPENAIR3_DIR}/UTILS/enum_string.c
${OPENAIR3_DIR}/UTILS/log.c
- ${OPENAIR3_DIR}/UTILS/mme_config.c
${OPENAIR3_DIR}/UTILS/mcc_mnc_itu.c
)
diff --git a/openair2/COMMON/commonDef.h b/openair2/COMMON/commonDef.h
index e33e64ec06..64216b0094 100644
--- a/openair2/COMMON/commonDef.h
+++ b/openair2/COMMON/commonDef.h
@@ -48,7 +48,19 @@ Description Contains global common definitions
#include <stdint.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"
@@ -59,13 +71,6 @@ Description Contains global common definitions
#define RETURNok (0)
#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
* where the NAS application is executed and where are located files
diff --git a/openair2/LAYER2/RLC/rlc.h b/openair2/LAYER2/RLC/rlc.h
index 392ae88cf8..72fde0b746 100755
--- a/openair2/LAYER2/RLC/rlc.h
+++ b/openair2/LAYER2/RLC/rlc.h
@@ -60,6 +60,8 @@
# include "DRB-ToAddModList.h"
# include "SRB-ToAddMod.h"
# include "SRB-ToAddModList.h"
+# include "DRB-ToReleaseList.h"
+
#ifdef Rel10
#include "PMCH-InfoList-r9.h"
#endif
diff --git a/openair2/UTIL/OCG/OCG_parse_XML.c b/openair2/UTIL/OCG/OCG_parse_XML.c
index 5397cdbd98..0100d742e1 100644
--- a/openair2/UTIL/OCG/OCG_parse_XML.c
+++ b/openair2/UTIL/OCG/OCG_parse_XML.c
@@ -51,10 +51,6 @@
#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 environment_system_config_; /*!< \brief indicating that the parsing position is now within Envi_Config_*/
--
GitLab