zig

commit 32c51e015674af346aae1c3f40fed9ef098a6693 (tree)
parent 4adffea8d03f63650263e5ea984ecd47b0b3a903
Author: Josh Wolfe <thejoshwolfe@gmail.com>
Date:   Mon, 11 Sep 2017 21:37:37 -0700

Merge remote-tracking branch 'origin/c-to-zig' into c-to-zig

Diffstat:
M
src/codegen.cpp
 | 
2
+-
M
src/ir.cpp
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -5021,7 +5021,7 @@ void codegen_parsec(CodeGen *g, Buf *full_path) {
     ZigList<ErrorMsg *> errors = {0};
     int err = parse_h_file(import, &errors, buf_ptr(full_path), g, nullptr);
     if (err) {
-        fprintf(stderr, "unable to parse .h file: %s\n", err_str(err));
+        fprintf(stderr, "unable to parse C file: %s\n", err_str(err));
         exit(1);
     }
 
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -13421,7 +13421,7 @@ static TypeTableEntry *ir_analyze_instruction_c_import(IrAnalyze *ira, IrInstruc
 
     int err;
     if ((err = parse_h_buf(child_import, &errors, &cimport_scope->buf, ira->codegen, node))) {
-        zig_panic("unable to parse h file: %s\n", err_str(err));
+        zig_panic("unable to parse C file: %s\n", err_str(err));
     }
 
     if (errors.length > 0) {