Commit 32c51e015674af346aae1c3f40fed9ef098a6693 | zig | Meg's Mirrors

author	Josh Wolfe <thejoshwolfe@gmail.com> 2017-09-11 21:37:37-07:00
committer	Josh Wolfe <thejoshwolfe@gmail.com> 2017-09-11 21:37:37-07:00
log	32c51e015674af346aae1c3f40fed9ef098a6693
tree	08d482eb98ae19afd62c02b8071a514422f8be12
parent	4adffea8d03f63650263e5ea984ecd47b0b3a903
parent	bf52a748037fad46571a9a76009ea1ca66c9d965

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

2 files changed, 2 insertions(+), 2 deletions(-)

src
- codegen.cpp
- ir.cpp

src/codegen.cpp+1-1

...	...	@@ -5021,7 +5021,7 @@ void codegen_parsec(CodeGen g, Buf full_path) {
5021	5021	ZigList<ErrorMsg *> errors = {0};
5022	5022	int err = parse_h_file(import, &errors, buf_ptr(full_path), g, nullptr);
5023	5023	if (err) {
5024		fprintf(stderr, "unable to parse .h file: %s\n", err_str(err));
	5024	fprintf(stderr, "unable to parse C file: %s\n", err_str(err));
5025	5025	exit(1);
5026	5026	}
5027	5027

src/ir.cpp+1-1

...	...	@@ -13421,7 +13421,7 @@ static TypeTableEntry ir_analyze_instruction_c_import(IrAnalyze ira, IrInstruc
13421	13421
13422	13422	int err;
13423	13423	if ((err = parse_h_buf(child_import, &errors, &cimport_scope->buf, ira->codegen, node))) {
13424		zig_panic("unable to parse h file: %s\n", err_str(err));
	13424	zig_panic("unable to parse C file: %s\n", err_str(err));
13425	13425	}
13426	13426
13427	13427	if (errors.length > 0) {