diff options
author | Thomas Harning Jr <harningt@gmail.com> | 2011-01-15 20:32:15 -0500 |
---|---|---|
committer | Thomas Harning Jr <harningt@gmail.com> | 2011-01-15 20:32:15 -0500 |
commit | 5ec63dfcc62a70be811e2abd09e372113500beec (patch) | |
tree | 20a7198cd5012bb1fcde84643ca98e93eb720706 /src/buffer_event.c | |
parent | 938d68fa73d5ded18d33dcf40077e627fd2b975a (diff) | |
parent | d1c516f4beb47e79fb886e46a4b6e0cf432d850a (diff) | |
download | luaevent-prosody-5ec63dfcc62a70be811e2abd09e372113500beec.tar.gz luaevent-prosody-5ec63dfcc62a70be811e2abd09e372113500beec.zip |
Merge remote branch 'jsnyder-tree/master'
Conflicts:
CHANGELOG
Makefile
README
Diffstat (limited to 'src/buffer_event.c')
-rw-r--r-- | src/buffer_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer_event.c b/src/buffer_event.c index 8a663bc..598230f 100644 --- a/src/buffer_event.c +++ b/src/buffer_event.c @@ -1,9 +1,9 @@ /* LuaEvent - Copyright (C) 2007 Thomas Harning <harningt@gmail.com> * Licensed as LGPL - See doc/COPYING for details */ +#include <stdlib.h> #include "buffer_event.h" #include "utility.h" #include <lauxlib.h> -#include <malloc.h> #include "event_buffer.h" #define BUFFER_EVENT_MT "BUFFER_EVENT_MT" |