prosody
df4f52cabdfe

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

7191:df4f52cabdfe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Feb 2016 11:20:00 +0100
parents 7188:e8f20be3e6f8 (current diff) 7190:7a14ea196db3 (diff)
children 7195:39b7ea9141c0
files prosodyctl
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/prosodyctl	Mon Feb 22 18:46:59 2016 +0100
+++ b/prosodyctl	Wed Feb 24 11:20:00 2016 +0100
@@ -233,6 +233,7 @@
 		type = "local",
 		events = prosody.events,
 		modules = {},
+		sessions = {},
 		users = require "core.usermanager".new_null_provider(hostname)
 	};
 end
--- a/util-src/crand.c	Mon Feb 22 18:46:59 2016 +0100
+++ b/util-src/crand.c	Wed Feb 24 11:20:00 2016 +0100
@@ -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