summaryrefslogtreecommitdiff
path: root/ext/iconv
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-03-23 20:33:54 +0100
committerAnatol Belski <ab@php.net>2015-03-23 20:33:54 +0100
commit2d78023244eaa5ec60b1325e530150394d625fa8 (patch)
tree8c860ae1f6a44fa7bf7ae8e9f2406af91c1abe9c /ext/iconv
parentec89c85054e44a0d4ea85f62601405843cd05d5d (diff)
downloadphp-git-2d78023244eaa5ec60b1325e530150394d625fa8.tar.gz
cleanup the mod version macros, round 2
Diffstat (limited to 'ext/iconv')
-rw-r--r--ext/iconv/iconv.c2
-rw-r--r--ext/iconv/php_iconv.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 7621ce75ac..638160cb69 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -154,7 +154,7 @@ zend_module_entry iconv_module_entry = {
NULL,
NULL,
PHP_MINFO(miconv),
- NO_VERSION_YET,
+ PHP_ICONV_VERSION,
PHP_MODULE_GLOBALS(iconv),
PHP_GINIT(iconv),
NULL,
diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
index 527f497a6a..1dc25de9dd 100644
--- a/ext/iconv/php_iconv.h
+++ b/ext/iconv/php_iconv.h
@@ -34,6 +34,9 @@
# define PHP_ICONV_API
#endif
+#include "php_version.h"
+#define PHP_ICONV_VERSION PHP_VERSION
+
#ifdef PHP_ATOM_INC
#include "ext/iconv/php_have_iconv.h"
#include "ext/iconv/php_have_libiconv.h"