Merge remote-tracking branch 'origin/develop' into agent-performance

2016-04-04 10:49:35 +01:00
parent a226423258 f545a225a4
commit 224ec7c4a1
114 changed files with 758 additions and 314 deletions
@@ -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