From b83aca1d0f4032ab4ca5a48b6ef647614dc68274 Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Wed, 27 Nov 2013 07:44:31 +0000
Subject: [PATCH] Moved "assertions.h" into the "common/utils" directory.
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4536 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
common/utils/asn1_conversions.h | 2 +-
{openair2/UTIL => common/utils}/assertions.h | 4 ++--
openair1/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c | 2 +-
openair1/SIMULATION/ETH_TRANSPORT/pgm_link.c | 2 +-
openair2/RRC/LITE/rrc_eNB.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
rename {openair2/UTIL => common/utils}/assertions.h (100%)
diff --git a/common/utils/asn1_conversions.h b/common/utils/asn1_conversions.h
index 42b375f48c..1f598b04e0 100644
--- a/common/utils/asn1_conversions.h
+++ b/common/utils/asn1_conversions.h
@@ -31,7 +31,7 @@
#define ASN1_CONVERSIONS_H_
#include "BIT_STRING.h"
-#include "UTIL/assertions.h"
+#include "assertions.h"
//-----------------------begin func -------------------
diff --git a/openair2/UTIL/assertions.h b/common/utils/assertions.h
similarity index 100%
rename from openair2/UTIL/assertions.h
rename to common/utils/assertions.h
index c006e16d49..9143d1551b 100644
--- a/openair2/UTIL/assertions.h
+++ b/common/utils/assertions.h
@@ -27,11 +27,11 @@
06410 Biot FRANCE
*******************************************************************************/
-#include <stdio.h>
-
#ifndef ASSERTIONS_H_
#define ASSERTIONS_H_
+#include <stdio.h>
+
#define DevCheck(cOND, vALUE1, vALUE2, vALUE3) \
do { \
if (!(cOND)) { \
diff --git a/openair1/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c b/openair1/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c
index bc8936a886..0dc8d0cb59 100644
--- a/openair1/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c
+++ b/openair1/SIMULATION/ETH_TRANSPORT/bypass_session_layer.c
@@ -12,7 +12,7 @@
#include "proto.h"
#include "extern.h"
-#include "UTIL/assertions.h"
+#include "assertions.h"
#include "UTIL/OCG/OCG.h"
#include "UTIL/OCG/OCG_extern.h"
#include "UTIL/LOG/log.h"
diff --git a/openair1/SIMULATION/ETH_TRANSPORT/pgm_link.c b/openair1/SIMULATION/ETH_TRANSPORT/pgm_link.c
index d587a9ebe9..746e0081ce 100644
--- a/openair1/SIMULATION/ETH_TRANSPORT/pgm_link.c
+++ b/openair1/SIMULATION/ETH_TRANSPORT/pgm_link.c
@@ -10,7 +10,7 @@
#include <pgm/pgm.h>
-#include "UTIL/assertions.h"
+#include "assertions.h"
#include "multicast_link.h"
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 3fa270ac7e..b2e3c3ddb5 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -39,7 +39,7 @@
#include "defs.h"
#include "extern.h"
-#include "UTIL/assertions.h"
+#include "assertions.h"
#include "asn1_conversions.h"
#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
#include "LAYER2/RLC/rlc.h"
--
GitLab