merge conflicts

1 files changed, 33 insertions, 0 deletions

diff --git a/src/errmsg.hpp b/src/errmsg.hpp
new file mode 100644
index 0000000000..1f31020902
--- /dev/null
+++ b/src/errmsg.hpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2015 Andrew Kelley
+ *
+ * This file is part of zig, which is MIT licensed.
+ * See http://opensource.org/licenses/MIT
+ */
+
+#ifndef ZIG_ERRMSG_HPP
+#define ZIG_ERRMSG_HPP
+
+#include "buffer.hpp"
+#include "list.hpp"
+
+enum ErrColor {
+    ErrColorAuto,
+    ErrColorOff,
+    ErrColorOn,
+};
+
+struct ErrorMsg {
+    int line_start;
+    int column_start;
+    int line_end;
+    int column_end;
+    Buf *msg;
+    Buf *path;
+    Buf *source;
+    ZigList<int> *line_offsets;
+};
+
+void print_err_msg(ErrorMsg *msg, ErrColor color);
+
+#endif