diff --git a/common/utils/asn1_conversions.h b/common/utils/asn1_conversions.h index 42b375f48c16faea68577088d6933e28a69f4db0..1f598b04e065283d1d84038f5110cb8b2f555f02 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 c006e16d490d7aaf1904c4261ab37d9a8feb0925..9143d1551bccc2eec92f498912cd4697667db732 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 bc8936a88645d518e42204b7c143fe24e61b1c33..0dc8d0cb59406278faa48eb341bec67038fd1ea3 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 d587a9ebe9d9c1a6952b062f09bd7b6221721e04..746e0081cebd9719989178bb52dead5948238ce6 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 3fa270ac7ef286a9e7478bc56e88945cf88cc3bd..b2e3c3ddb543f6837a66ffa2f358a1245bbcb543 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"