Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into noCore

2020-09-22 17:57:27 +02:00
parent 19c6229049 5372a3478a
commit 3024f57805
20 changed files with 250 additions and 276 deletions
@@ -16,13 +16,13 @@
 #include "NwEvt.h"
 #include "NwLog.h"

+#ifndef __NW_MINI_LOG_MGR_H__
+#define __NW_MINI_LOG_MGR_H__
+
 #ifndef NW_ASSERT
 #define NW_ASSERT assert
 #endif

-#ifndef __NW_MINI_LOG_MGR_H__
-#define __NW_MINI_LOG_MGR_H__
-
 extern uint32_t g_log_level;


@@ -17,13 +17,13 @@
 #include "NwEvt.h"
 #include "NwLog.h"

+#ifndef __NW_MINI_TMR_MGR_H__
+#define __NW_MINI_TMR_MGR_H__
+
 #ifndef NW_ASSERT
 #define NW_ASSERT assert
 #endif

-#ifndef __NW_MINI_TMR_MGR_H__
-#define __NW_MINI_TMR_MGR_H__
-
 typedef struct {
  NwEventT      ev;
  void*         timeoutArg;
@@ -17,13 +17,13 @@
 #include "NwEvt.h"
 #include "NwLog.h"

+#ifndef __NW_MINI_UDP_ENTITY_H__
+#define __NW_MINI_UDP_ENTITY_H__
+
 #ifndef NW_ASSERT
 #define NW_ASSERT assert
 #endif

-#ifndef __NW_MINI_UDP_ENTITY_H__
-#define __NW_MINI_UDP_ENTITY_H__
-
 typedef struct {
  uint32_t        hSocket;
  NwEventT      ev;