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 /include | |
parent | f7ab1cd465cba96635b79281efef4790edc38a1a (diff) | |
parent | 5235f87126cc2bca3907daada9f59e0c7c7bc834 (diff) |
resolved conflict
Diffstat (limited to 'include')
-rw-r--r-- | include/extension.h | 11 | ||||
-rw-r--r-- | include/version.h | 17 |
2 files changed, 27 insertions, 1 deletions
diff --git a/include/extension.h b/include/extension.h index 562fceb..15ad5e1 100644 --- a/include/extension.h +++ b/include/extension.h @@ -38,10 +38,19 @@ class Extension : public Namespace public: /** * Constructor that defines a number of functions right away + * + * The first two parameters should be filled by the extension programmer with the + * name of the extension, and the version number of the extension (like "1.0"). + * The third parameter, apiversion, does not have to be supplied and is best kept + * to the default value. This third parameter checks whether the PHP-CPP version + * that is currently installed on the server is the same as the PHP-CPP version + * that was used to compile the extension with. + * * @param name Extension name * @param version Extension version string + * @param apiversion PHP API version (this should always be PHPCPP_API_VERSION, so you better not supply it) */ - Extension(const char *name, const char *version = "1.0"); + Extension(const char *name, const char *version = "1.0", int apiversion = PHPCPP_API_VERSION); /** * No copy'ing and no moving diff --git a/include/version.h b/include/version.h new file mode 100644 index 0000000..85d2b66 --- /dev/null +++ b/include/version.h @@ -0,0 +1,17 @@ +/** + * Version.h + * + * Macro with API version. The API version number prevents that + * extensions are loaded that are incompatible with the libphpcpp.so + * library + * + * @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com> + * @copyright 2015 Copernica BV + */ + +/** + * Macro with version number (this is incremented with every release) + */ +#define PHPCPP_API_VERSION 20150120 + + |