diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2015-01-20 17:14:10 +0100 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2015-01-20 17:14:10 +0100 |
| commit | ae35c4f2b94e37c871ec144ca83c93f215ac6b26 (patch) | |
| tree | 73bfe1c808b48c966c3a1b4161f626bb705dbdbf /zend/extension.cpp | |
| parent | f7ab1cd465cba96635b79281efef4790edc38a1a (diff) | |
| parent | 5235f87126cc2bca3907daada9f59e0c7c7bc834 (diff) | |
resolved conflict
Diffstat (limited to 'zend/extension.cpp')
| -rw-r--r-- | zend/extension.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zend/extension.cpp b/zend/extension.cpp index 1545f89..4ad54a3 100644 --- a/zend/extension.cpp +++ b/zend/extension.cpp @@ -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 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 |