summaryrefslogtreecommitdiffhomepage
path: root/src/error.c
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2013-03-17 00:28:49 +0900
committerYukihiro Matz Matsumoto <[email protected]>2013-03-17 00:28:49 +0900
commit8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b (patch)
treef55227fc4ac88eb640688e31451028a2910de618 /src/error.c
parent3f85079cc045012285ce432b446b77eab82de7fe (diff)
parent4ad08caca0b90ff7ef4b4f0080c54004f858d597 (diff)
downloadmruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.tar.gz
mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.zip
resolve conflict from #1017
Diffstat (limited to 'src/error.c')
-rw-r--r--src/error.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/error.c b/src/error.c
index 488ab6cef..ddf92382b 100644
--- a/src/error.c
+++ b/src/error.c
@@ -7,6 +7,7 @@
#include "mruby.h"
#include <errno.h>
#include <stdarg.h>
+#include <stdlib.h>
#include <setjmp.h>
#include <string.h>
#include "error.h"