From 248318dd608ede0b597951ff45c22164ee4f71d0 Mon Sep 17 00:00:00 2001 From: Martijn Otto Date: Thu, 19 May 2016 10:55:43 +0200 Subject: Updated the required PHP version and correctly install the classimpl pointer in the doc_comment --- zend/classimpl.cpp | 3 +++ zend/includes.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zend/classimpl.cpp b/zend/classimpl.cpp index 75191f5..7ced789 100644 --- a/zend/classimpl.cpp +++ b/zend/classimpl.cpp @@ -1439,6 +1439,9 @@ zend_class_entry *ClassImpl::initialize(ClassBase *base, const std::string &pref // copy over the 'this'-pointer after the null-character std::memcpy(ZSTR_VAL(_self) + 1, &impl, sizeof(impl)); + // install the doc_comment + _entry->info.user.doc_comment = _self; + // set access types flags for class _entry->ce_flags = (int)_type; diff --git a/zend/includes.h b/zend/includes.h index 89054c3..4908e77 100644 --- a/zend/includes.h +++ b/zend/includes.h @@ -42,8 +42,8 @@ /** * We don't compile for php7 just yet */ -#if PHP_VERSION_ID >= 70000 -# error "This library is currently not yet compatible with php7." +#if PHP_VERSION_ID < 70000 +# error "This library required PHP version 7.0 or higher. Use PHP-CPP-LEGACY for older versions." #endif /** -- cgit v1.2.3