Merge branch 'master' into feature-21-TM7

common/utils/collection/hashtable/hashtable.c

@@ -177,7 +177,6 @@ hashtable_rc_t hashtable_dump_content (const hash_table_t * const hashtblP, char
 {
     hash_node_t  *node         = NULL;
     unsigned int  i            = 0;
-    unsigned int  num_elements = 0;
     if (hashtblP == NULL) {
         *remaining_bytes_in_buffer_pP = snprintf(
                 buffer_pP,

common/utils/itti/memory_pools.c

@@ -54,7 +54,9 @@ uint64_t vcd_mp_free;
 #endif
 
 /*------------------------------------------------------------------------------*/
+#ifndef CHARS_TO_UINT32
 #define CHARS_TO_UINT32(c1, c2, c3, c4) (((c1) << 24) | ((c2) << 16) | ((c3) << 8) | (c4))
+#endif
 
 #define MEMORY_POOL_ITEM_INFO_NUMBER    2