mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-18 10:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ODIN_* platform constants to core:os

Browse Source
This commit is contained in:
gingerBill
2018-05-27 11:03:46 +01:00
parent 7ee9051a56
commit 6aae381e83
18 changed files with 72 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/check_decl.cpp
View File

@@ -534,12 +534,7 @@ void check_proc_decl(Checker *c, Entity *e, DeclInfo *d) {
e->deprecated_message = ac.deprecated_message;
ac.link_name = handle_link_name(c, e->token, ac.link_name, ac.link_prefix);
AstPackage *package = nullptr;
if (d->scope->parent && d->scope->parent->is_package) {
package = d->scope->parent->package;
}
if (package != nullptr && e->token.string == "main") {
if (e->package != nullptr && e->token.string == "main") {
if (pt->param_count != 0 ||
pt->result_count != 0) {
gbString str = type_to_string(proc_type);
@@ -551,7 +546,7 @@ void check_proc_decl(Checker *c, Entity *e, DeclInfo *d) {
error(e->token, "Procedure 'main' cannot have a custom calling convention");
}
pt->calling_convention = ProcCC_Contextless;
if (package->kind == ImportedPackage_Init) {
if (e->package->kind == ImportedPackage_Init) {
if (c->info.entry_point != nullptr) {
error(e->token, "Redeclaration of the entry pointer procedure 'main'");
} else {