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

master
Josh Wolfe 2017-09-11 21:37:37 -07:00
commit 32c51e0156
2 changed files with 2 additions and 2 deletions

View File

@ -5021,7 +5021,7 @@ void codegen_parsec(CodeGen *g, Buf *full_path) {
ZigList<ErrorMsg *> errors = {0}; ZigList<ErrorMsg *> errors = {0};
int err = parse_h_file(import, &errors, buf_ptr(full_path), g, nullptr); int err = parse_h_file(import, &errors, buf_ptr(full_path), g, nullptr);
if (err) { 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); exit(1);
} }

View File

@ -13421,7 +13421,7 @@ static TypeTableEntry *ir_analyze_instruction_c_import(IrAnalyze *ira, IrInstruc
int err; int err;
if ((err = parse_h_buf(child_import, &errors, &cimport_scope->buf, ira->codegen, node))) { 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) { if (errors.length > 0) {