codegen: Explicitly include <glib.h> as needed for null-literal

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index ee1c4fbb15dc2997efbc338731751b7d67f0f1f4..f8ff16872340b86d67969137422002f7a0d26a61 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -4308,7 +4308,9 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
        }
 
        public override void visit_null_literal (NullLiteral expr) {
-               if (context.profile != Profile.GOBJECT) {
+               if (context.profile == Profile.GOBJECT) {
+                       cfile.add_include ("glib.h");
+               } else {
                        cfile.add_include ("stddef.h");
                }
                set_cvalue (expr, new CCodeConstant ("NULL"));

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7166e74e0e4dd4450adb912c94111b66c36e725e..8079e335a4eb0e5a6e9a97ae6b46400112774c89 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,6 +37,7 @@ TESTS = \
        basic-types/gptrarray.vala \
        basic-types/gvariants.vala \
        basic-types/gvariants-unboxing-safe.vala \
+       basic-types/null.vala \
        basic-types/bug570846.test \
        basic-types/bug571486.vala \
        basic-types/bug591552.vala \

diff --git a/tests/basic-types/null.vala b/tests/basic-types/null.vala
new file mode 100644 (file)
index 0000000..c633e35
--- /dev/null
+++ b/tests/basic-types/null.vala
@@ -0,0 +1,3 @@
+void main () {
+       void* foo = null;
+}