merge conflicts

1 files changed, 2 insertions, 10 deletions

diff --git a/src/codegen.hpp b/src/codegen.hpp
index 4476017840..8c83e2144a 100644
--- a/src/codegen.hpp
+++ b/src/codegen.hpp
@@ -9,6 +9,7 @@
 #define ZIG_CODEGEN_HPP
 
 #include "parser.hpp"
+#include "errmsg.hpp"
 
 struct CodeGen;
 
@@ -19,16 +20,6 @@ enum OutType {
     OutTypeObj,
 };
 
-
-struct ErrorMsg {
-    int line_start;
-    int column_start;
-    int line_end;
-    int column_end;
-    Buf *msg;
-};
-
-
 CodeGen *codegen_create(Buf *root_source_dir);
 
 enum CodeGenBuildType {
@@ -39,6 +30,7 @@ void codegen_set_build_type(CodeGen *codegen, CodeGenBuildType build_type);
 void codegen_set_is_static(CodeGen *codegen, bool is_static);
 void codegen_set_strip(CodeGen *codegen, bool strip);
 void codegen_set_verbose(CodeGen *codegen, bool verbose);
+void codegen_set_errmsg_color(CodeGen *codegen, ErrColor err_color);
 void codegen_set_out_type(CodeGen *codegen, OutType out_type);
 void codegen_set_out_name(CodeGen *codegen, Buf *out_name);