Merge branch 'master' into blub/bc3

diff --cc gmqcc.h
index 58e12cfd3f193d713d99132f2b4df863b55706aa,75dceaf6527352256020b790c6c9f116b3c15e94..efb380b406bce127aa4e05d606baf24ae28b25a6
--- 1/gmqcc.h
--- 2/gmqcc.h
+++ b/gmqcc.h
@@@ -719,19 -769,9 +719,19 @@@ void Tself##_##mem##_clear(Tself *self
      (owner)->mem##_alloc = 0;       \
  }
  
 +#define MEM_VECTOR_MOVE(from, mem, to, tm)   \
 +{                                            \
 +    (to)->tm = (from)->mem;                  \
 +    (to)->tm##_count = (from)->mem##_count;  \
 +    (to)->tm##_alloc = (from)->mem##_alloc;  \
 +    (from)->mem = NULL;                      \
 +    (from)->mem##_count = 0;                 \
 +    (from)->mem##_alloc = 0;                 \
 +}
 +
  #define MEM_VEC_FUNCTIONS(Tself, Twhat, mem) \
- _MEM_VEC_FUN_REMOVE(Tself, Twhat, mem)       \
- _MEM_VEC_FUN_ADD(Tself, Twhat, mem)
+ MEM_VEC_FUN_REMOVE(Tself, Twhat, mem)        \
+ MEM_VEC_FUN_ADD(Tself, Twhat, mem)
  
  #define MEM_VEC_FUNCTIONS_ALL(Tself, Twhat, mem) \
  MEM_VEC_FUNCTIONS(Tself, Twhat, mem)             \