summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--codegen/valaccodebasemodule.vala2
-rw-r--r--vala/valaconstant.vala7
2 files changed, 6 insertions, 3 deletions
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index f23c42b42..cb5ee3750 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -961,7 +961,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
return;
}
- if (!c.external) {
+ if (!c.external || (c.source_type == SourceFileType.FAST && c.value != null)) {
generate_type_declaration (c.type_reference, decl_space);
c.value.emit (this);
diff --git a/vala/valaconstant.vala b/vala/valaconstant.vala
index 0a9266cf1..b98568f33 100644
--- a/vala/valaconstant.vala
+++ b/vala/valaconstant.vala
@@ -123,8 +123,11 @@ public class Vala.Constant : Symbol {
if (!external) {
if (value == null) {
- error = true;
- Report.error (source_reference, "A const field requires a value to be provided");
+ // constants from fast-vapi files are special
+ if (source_type != SourceFileType.FAST) {
+ error = true;
+ Report.error (source_reference, "A const field requires a value to be provided");
+ }
} else {
value.target_type = type_reference;