summaryrefslogtreecommitdiff
path: root/src/nullmember.h
diff options
context:
space:
mode:
authorMartijn Otto <martijn.otto@copernica.com>2014-02-17 17:04:11 +0100
committerMartijn Otto <martijn.otto@copernica.com>2014-02-17 17:04:11 +0100
commit1ae81bf877a40929c986c1b7961c2f70918fbb7e (patch)
tree323d41800a755840a112843025bbaeee3e720020 /src/nullmember.h
parent013754c6fe34073b8a2c9a5d97cea0b4c3ed9859 (diff)
Fix constant declare function getting called for non-const and vice-versa
Diffstat (limited to 'src/nullmember.h')
-rw-r--r--src/nullmember.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nullmember.h b/src/nullmember.h
index 54285f0..9b8584f 100644
--- a/src/nullmember.h
+++ b/src/nullmember.h
@@ -44,11 +44,11 @@ public:
virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override
{
#if PHP_VERSION_ID >= 50400
- if (flags == constMember) zend_declare_property_null(entry, name, size, flags);
- else zend_declare_class_constant_null(entry, name, size);
+ if (flags == constMember) zend_declare_class_constant_null(entry, name, size);
+ else zend_declare_property_null(entry, name, size, flags);
#else
- if (flags == constMember) zend_declare_property_null(entry, (char *) name, size, flags);
- else zend_declare_class_constant_null(entry, (char *) name, size);
+ if (flags == constMember) zend_declare_class_constant_null(entry, (char *) name, size);
+ else zend_declare_property_null(entry, (char *) name, size, flags);
#endif
}
};