Merge commit 'develop' into feature-127-protocol-split

* remove a lot of white spaces
* many conflicts in enb_config.c

openair2/UTIL/MEM/mem_block.c

@@ -61,6 +61,7 @@ uint32_t             counters[14] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 /*
  * initialize all ures
  */
+extern mem_pool  *memBlockVar;
 void           *
 pool_buffer_init (void)
 {
@@ -68,6 +69,7 @@ pool_buffer_init (void)
 
   uint32_t             index, mb_index, pool_index;
   mem_pool       *memory = (mem_pool *) &mem_block_var;
+  memBlockVar=malloc(sizeof(mem_pool));
   int             pool_sizes[14] = { MEM_MNGT_MB0_NB_BLOCKS, MEM_MNGT_MB1_NB_BLOCKS,
                                      MEM_MNGT_MB2_NB_BLOCKS, MEM_MNGT_MB3_NB_BLOCKS,
                                      MEM_MNGT_MB4_NB_BLOCKS, MEM_MNGT_MB5_NB_BLOCKS,

openair2/UTIL/MEM/mem_block.h

@@ -32,12 +32,17 @@
 #    define __MEM_BLOCK_H__
 
 #include <stdint.h>
+#include <stddef.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include "openair2/COMMON/platform_constants.h"
 //-----------------------------------------------------------------------------
 
 typedef struct mem_block_t {
   struct mem_block_t *next;
   struct mem_block_t *previous;
+  size_t size;
   unsigned char pool_id;
   unsigned char *data;
 } mem_block_t;
@@ -175,7 +180,10 @@ typedef struct {
 
 } mem_pool;
 
-mem_pool  mem_block_var;
-
+mem_pool  *memBlockVar;
+#define mem_block_var (*memBlockVar)
 
+#ifdef __cplusplus
+}
+#endif
 #endif