dlmalloc/malloc.c: Try to fix compilation on server
Merge branch 'master' into far3

* master:
  dlmalloc/malloc.c: Try to fix compilation on server