diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-24 11:20:00 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-24 11:20:00 +0100 |
| commit | 9a7bce4946a4a302905bdccd23ce59dc245803e8 (patch) | |
| tree | 60121c160143098d7d661c2dcafd57af5c4ea5de | |
| parent | 349f3e7a755249a16acf5417f9bea95c0df77513 (diff) | |
| parent | bdabf32dc62bc1d62fe9954c82be48a60ea7232a (diff) | |
| download | prosody-9a7bce4946a4a302905bdccd23ce59dc245803e8.tar.gz prosody-9a7bce4946a4a302905bdccd23ce59dc245803e8.zip | |
Merge 0.10->trunk
| -rwxr-xr-x | prosodyctl | 1 | ||||
| -rw-r--r-- | util-src/crand.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -233,6 +233,7 @@ local function make_host(hostname) type = "local", events = prosody.events, modules = {}, + sessions = {}, users = require "core.usermanager".new_null_provider(hostname) }; end diff --git a/util-src/crand.c b/util-src/crand.c index 9a45f10f..735135fb 100644 --- a/util-src/crand.c +++ b/util-src/crand.c @@ -23,7 +23,7 @@ * TODO: Decide on fixed size or dynamically allocated buffer */ #if 1 -#include <malloc.h> +#include <stdlib.h> #else #define BUFLEN 256 #endif |