Merge branch '2.2' into develop

2018-07-06 14:56:19 +03:00
parent f2b8487577 cb05199bac
commit bfd3d2975d
8 changed files with 68 additions and 10 deletions
--- a/server/core/internal/mlist.h
+++ b/server/core/internal/mlist.h
@ -32,7 +32,7 @@ typedef struct mlist_st
    bool           mlist_deleted;
    size_t         mlist_nodecount;
    size_t         mlist_nodecount_max; /**< size limit. 0 == no limit */
-    size_t         mlist_versno;
+    volatile size_t mlist_versno;
    bool           mlist_flat;
    mlist_node_t*  mlist_first;
    mlist_node_t*  mlist_last;