diff options
-rw-r--r-- | hhvm/extension.cpp | 7 | ||||
-rw-r--r-- | hhvm/extensionimpl.h | 3 | ||||
-rw-r--r-- | hhvm/includes.h | 4 | ||||
-rw-r--r-- | zend/script.cpp | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/hhvm/extension.cpp b/hhvm/extension.cpp index 9685b32..97fdaed 100644 --- a/hhvm/extension.cpp +++ b/hhvm/extension.cpp @@ -2,7 +2,7 @@ * Extension.cpp * * @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com> - * @copyright 2013, 2014 Copernica BV + * @copyright 2013, 2014, 2015 Copernica BV */ #include "includes.h" @@ -15,9 +15,10 @@ namespace Php { * Constructor that defines a number of functions right away * @param name Extension name * @param version Extension version string + * @param apiversion The API version number */ -Extension::Extension(const char *name, const char *version) : - Namespace(""), _impl(new ExtensionImpl(this, name, version)) {} +Extension::Extension(const char *name, const char *version, int apiversion) : + Namespace(""), _impl(new ExtensionImpl(this, name, version, apiversion)) {} /** * Destructor diff --git a/hhvm/extensionimpl.h b/hhvm/extensionimpl.h index deb80a6..3444f8b 100644 --- a/hhvm/extensionimpl.h +++ b/hhvm/extensionimpl.h @@ -30,8 +30,9 @@ public: * @param data Pointer to the extension object created by the extension programmer * @param name Name of the extension * @param version Version identifier of the extension + * @param apiversion API version number */ - ExtensionImpl(Extension *data, const char *name, const char *version) : ExtensionBase(data) {} + ExtensionImpl(Extension *data, const char *name, const char *version, int apiversion) : ExtensionBase(data) {} /** * Destructor diff --git a/hhvm/includes.h b/hhvm/includes.h index 0e587db..191e390 100644 --- a/hhvm/includes.h +++ b/hhvm/includes.h @@ -17,6 +17,7 @@ #include <map> #include <string.h> #include <iostream> +#include <set> /** * HHVM includes @@ -26,8 +27,11 @@ /** * Public include files */ +#include "../include/version.h" #include "../include/type.h" #include "../include/hashparent.h" +#include "../include/ini.h" +#include "../include/inivalue.h" #include "../include/value.h" #include "../include/parameters.h" #include "../include/classtype.h" diff --git a/zend/script.cpp b/zend/script.cpp index a1b5b04..988ab1c 100644 --- a/zend/script.cpp +++ b/zend/script.cpp @@ -50,7 +50,7 @@ zend_op_array *Script::compile(const char *name, const char *phpcode, size_t siz * @param script actual PHP code * @param size length of the string */ -Script::Script(const char *name, const char *phpcode, size_t size) +Script::Script(const char *name, const char *phpcode, size_t size) noexcept { // we need the tsrm_ls variable TSRMLS_FETCH(); |