cleanup the mod version macros, round 2

33 files changed, 57 insertions, 34 deletions

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 9c252f45fc..fec29d7519 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1056,7 +1056,7 @@ zend_module_entry gd_module_entry = {
 	NULL,
 #endif
 	PHP_MINFO(gd),
-	NO_VERSION_YET,
+	PHP_GD_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index d008e49a76..2af7887ebc 100644
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -64,6 +64,9 @@ PHPAPI extern const char php_sig_png[8];
 extern zend_module_entry gd_module_entry;
 #define phpext_gd_ptr &gd_module_entry
 
+#include "php_version.h"
+#define PHP_GD_VERSION PHP_VERSION
+
 /* gd.c functions */
 PHP_MINFO_FUNCTION(gd);
 PHP_MINIT_FUNCTION(gd);
diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 0cd7359fc3..91c2abb0eb 100644
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -127,7 +127,7 @@ zend_module_entry php_gettext_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(php_gettext),
-	NO_VERSION_YET,
+	PHP_GETTEXT_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/gettext/php_gettext.h b/ext/gettext/php_gettext.h
index b8a6030bcd..d17a6817ba 100644
--- a/ext/gettext/php_gettext.h
+++ b/ext/gettext/php_gettext.h
@@ -26,6 +26,9 @@
 extern zend_module_entry php_gettext_module_entry;
 #define gettext_module_ptr &php_gettext_module_entry
 
+#include "php_version.h"
+#define PHP_GETTEXT_VERSION PHP_VERSION
+
 PHP_MINFO_FUNCTION(php_gettext);
 
 PHP_NAMED_FUNCTION(zif_textdomain);
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 45b86b2932..9583934679 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -204,7 +204,7 @@ zend_module_entry gmp_module_entry = {
 	NULL,
 	ZEND_MODULE_DEACTIVATE_N(gmp),
 	ZEND_MODULE_INFO_N(gmp),
-	NO_VERSION_YET,
+	PHP_GMP_VERSION,
 	ZEND_MODULE_GLOBALS(gmp),
 	ZEND_GINIT(gmp),
 	NULL,
diff --git a/ext/gmp/php_gmp.h b/ext/gmp/php_gmp.h
index ca3f404d68..2ca592907e 100644
--- a/ext/gmp/php_gmp.h
+++ b/ext/gmp/php_gmp.h
@@ -26,6 +26,9 @@
 extern zend_module_entry gmp_module_entry;
 #define phpext_gmp_ptr &gmp_module_entry
 
+#include "php_version.h"
+#define PHP_GMP_VERSION PHP_VERSION
+
 ZEND_MODULE_STARTUP_D(gmp);
 ZEND_MODULE_DEACTIVATE_D(gmp);
 ZEND_MODULE_INFO_D(gmp);
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 1975d2dbc9..d9c3a892d9 100644
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -814,7 +814,7 @@ zend_module_entry mhash_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(mhash),
-	NO_VERSION_YET,
+	PHP_MHASH_VERSION,
 	STANDARD_MODULE_PROPERTIES,
 };
 
@@ -1271,9 +1271,7 @@ const zend_function_entry hash_functions[] = {
 /* {{{ hash_module_entry
  */
 zend_module_entry hash_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
 	STANDARD_MODULE_HEADER,
-#endif
 	PHP_HASH_EXTNAME,
 	hash_functions,
 	PHP_MINIT(hash),
@@ -1281,9 +1279,7 @@ zend_module_entry hash_module_entry = {
 	NULL, /* RINIT */
 	NULL, /* RSHUTDOWN */
 	PHP_MINFO(hash),
-#if ZEND_MODULE_API_NO >= 20010901
-	PHP_HASH_EXTVER, /* Replace with version number for your extension */
-#endif
+	PHP_HASH_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/hash/php_hash.h b/ext/hash/php_hash.h
index 0c3a8153cb..c8104710ba 100644
--- a/ext/hash/php_hash.h
+++ b/ext/hash/php_hash.h
@@ -24,7 +24,8 @@
 #include "php.h"
 
 #define PHP_HASH_EXTNAME	"hash"
-#define PHP_HASH_EXTVER		"1.0"
+#define PHP_HASH_VERSION	"1.0"
+#define PHP_MHASH_VERSION	"1.0"
 #define PHP_HASH_RESNAME	"Hash Context"
 
 #define PHP_HASH_HMAC		0x0001
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"
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index b5febac64d..55b1bac904 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -574,7 +574,7 @@ zend_module_entry imap_module_entry = {
 	PHP_RINIT(imap),
 	PHP_RSHUTDOWN(imap),
 	PHP_MINFO(imap),
-	NO_VERSION_YET,
+	PHP_IMAP_VERSION,
 	PHP_MODULE_GLOBALS(imap),
 	PHP_GINIT(imap),
 	NULL,
diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h
index a697a26b70..eb87a04e47 100644
--- a/ext/imap/php_imap.h
+++ b/ext/imap/php_imap.h
@@ -46,6 +46,8 @@
 extern zend_module_entry imap_module_entry;
 #define imap_module_ptr &imap_module_entry
 
+#include "php_version.h"
+#define PHP_IMAP_VERSION PHP_VERSION
 
 /* Data types */
 
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 1cb0be5d5a..919ea7de5e 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -451,7 +451,7 @@ zend_module_entry ibase_module_entry = {
 	NULL,
 	PHP_RSHUTDOWN(ibase),
 	PHP_MINFO(ibase),
-	NO_VERSION_YET,
+	PHP_INTERBASE_VERSION,
 	PHP_MODULE_GLOBALS(ibase),
 	PHP_GINIT(ibase),
 	NULL,
diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index 65e1fa8c0b..3e21f07f5a 100644
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -24,6 +24,9 @@
 extern zend_module_entry ibase_module_entry;
 #define phpext_interbase_ptr &ibase_module_entry
 
+#include "php_version.h"
+#define PHP_INTERBASE_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(ibase);
 PHP_RINIT_FUNCTION(ibase);
 PHP_MSHUTDOWN_FUNCTION(ibase);
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
index 8b05b58d2a..e20816e34e 100644
--- a/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c
@@ -874,9 +874,7 @@ static PHP_GINIT_FUNCTION(intl);
 
 /* {{{ intl_module_entry */
 zend_module_entry intl_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
 	STANDARD_MODULE_HEADER,
-#endif
 	"intl",
 	intl_functions,
 	PHP_MINIT( intl ),
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 22f4d89ce1..6ad3a93600 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -3289,7 +3289,7 @@ zend_module_entry ldap_module_entry = { /* {{{ */
 	NULL,
 	NULL,
 	PHP_MINFO(ldap),
-	NO_VERSION_YET,
+	PHP_LDAP_VERSION,
 	PHP_MODULE_GLOBALS(ldap),
 	PHP_GINIT(ldap),
 	NULL,
diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h
index 4ae38b2237..bce1d6f7aa 100644
--- a/ext/ldap/php_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -32,6 +32,9 @@
 extern zend_module_entry ldap_module_entry;
 #define ldap_module_ptr &ldap_module_entry
 
+#include "php_version.h"
+#define PHP_LDAP_VERSION PHP_VERSION
+
 /* LDAP functions */
 PHP_MINIT_FUNCTION(ldap);
 PHP_MSHUTDOWN_FUNCTION(ldap);
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 52f5dabe69..b96d25aa80 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -144,7 +144,7 @@ zend_module_entry libxml_module_entry = {
 	PHP_RINIT(libxml),       /* per-request startup function */
 	PHP_RSHUTDOWN(libxml),   /* per-request shutdown function */
 	PHP_MINFO(libxml),       /* information function */
-	NO_VERSION_YET,
+	PHP_LIBXML_VERSION,
 	PHP_MODULE_GLOBALS(libxml), /* globals descriptor */
 	PHP_GINIT(libxml),          /* globals ctor */
 	NULL,                       /* globals dtor */
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index 39a140c516..5a68a57494 100644
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -26,6 +26,9 @@
 extern zend_module_entry libxml_module_entry;
 #define libxml_module_ptr &libxml_module_entry
 
+#include "php_version.h"
+#define PHP_LIBXML_VERSION PHP_VERSION
+
 #ifdef PHP_WIN32
 #	define PHP_LIBXML_API __declspec(dllexport)
 #elif defined(__GNUC__) && __GNUC__ >= 4
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 6d1cd4f335..857ad7097e 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -572,7 +572,7 @@ zend_module_entry mbstring_module_entry = {
 	PHP_RINIT(mbstring),
 	PHP_RSHUTDOWN(mbstring),
 	PHP_MINFO(mbstring),
-	NO_VERSION_YET,
+	PHP_MBSTRING_VERSION,
 	PHP_MODULE_GLOBALS(mbstring),
 	PHP_GINIT(mbstring),
 	PHP_GSHUTDOWN(mbstring),
diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 9685c64d7b..2dffb63705 100644
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -51,6 +51,9 @@
 #define HAVE_MBSTRING 1
 #endif
 
+#include "php_version.h"
+#define PHP_MBSTRING_VERSION PHP_VERSION
+
 #ifdef PHP_WIN32
 #	undef MBSTRING_API
 #	ifdef MBSTRING_EXPORTS
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 399c6313b9..1cdedd596a 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -261,7 +261,7 @@ zend_module_entry mcrypt_module_entry = {
 	PHP_MINIT(mcrypt), PHP_MSHUTDOWN(mcrypt),
 	NULL, NULL,
 	PHP_MINFO(mcrypt),
-	NO_VERSION_YET,
+	PHP_MCRYPT_VERSION,
 	PHP_MODULE_GLOBALS(mcrypt),
 	NULL,
 	NULL,
diff --git a/ext/mcrypt/php_mcrypt.h b/ext/mcrypt/php_mcrypt.h
index acc74e53c0..f29eec72d7 100644
--- a/ext/mcrypt/php_mcrypt.h
+++ b/ext/mcrypt/php_mcrypt.h
@@ -30,6 +30,9 @@
 extern zend_module_entry mcrypt_module_entry;
 #define mcrypt_module_ptr &mcrypt_module_entry
 
+#include "php_version.h"
+#define PHP_MCRYPT_VERSION PHP_VERSION
+
 /* Functions for both old and new API */
 PHP_FUNCTION(mcrypt_ecb);
 PHP_FUNCTION(mcrypt_cbc);
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index f72a38b294..9bc81769d5 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -1008,12 +1008,8 @@ static const  zend_module_dep mysqli_deps[] = {
 /* {{{ mysqli_module_entry
  */
 zend_module_entry mysqli_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050922
 	STANDARD_MODULE_HEADER_EX, NULL,
 	mysqli_deps,
-#elif ZEND_MODULE_API_NO >= 20010901
-	STANDARD_MODULE_HEADER,
-#endif
 	"mysqli",
 	mysqli_functions,
 	PHP_MINIT(mysqli),
@@ -1021,7 +1017,7 @@ zend_module_entry mysqli_module_entry = {
 	PHP_RINIT(mysqli),
 	PHP_RSHUTDOWN(mysqli),
 	PHP_MINFO(mysqli),
-	"0.1", /* Replace with version number for your extension */
+	PHP_MYSQLI_VERSION,
 	PHP_MODULE_GLOBALS(mysqli),
 	PHP_GINIT(mysqli),
 	NULL,
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index efae22be0e..3cfc8fa847 100644
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -26,6 +26,9 @@
 #define phpext_mysqli_ptr &mysqli_module_entry
 extern zend_module_entry mysqli_module_entry;
 
+#include "php_version.h"
+#define PHP_MYSQLI_VERSION PHP_VERSION
+
 #endif	/* PHP_MYSQLI.H */
 
 /*
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 5af0e8d8f9..b1a84217f2 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2053,7 +2053,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, info)(const MYSQLND_CONN_DATA * const conn)
 /* {{{ mysqlnd_get_client_info */
 PHPAPI const char * mysqlnd_get_client_info()
 {
-	return MYSQLND_VERSION;
+	return PHP_MYSQLND_VERSION;
 }
 /* }}} */
 
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index 44f48b4b72..2e284ca1a5 100644
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -22,7 +22,7 @@
 #ifndef MYSQLND_H
 #define MYSQLND_H
 
-#define MYSQLND_VERSION "mysqlnd 5.0.11-dev - 20120503 - $Id$"
+#define PHP_MYSQLND_VERSION "mysqlnd 5.0.11-dev - 20120503 - $Id$"
 #define MYSQLND_VERSION_ID 50011
 
 #define MYSQLND_PLUGIN_API_VERSION 2
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
index 20225c9a37..e9eb773f9c 100644
--- a/ext/mysqlnd/mysqlnd_auth.c
+++ b/ext/mysqlnd/mysqlnd_auth.c
@@ -394,7 +394,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_native_auth_plugin =
 		MYSQLND_PLUGIN_API_VERSION,
 		"auth_plugin_mysql_native_password",
 		MYSQLND_VERSION_ID,
-		MYSQLND_VERSION,
+		PHP_MYSQLND_VERSION,
 		"PHP License 3.01",
 		"Andrey Hristov <andrey@mysql.com>,  Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
 		{
@@ -443,7 +443,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_pam_authentication_plugin
 		MYSQLND_PLUGIN_API_VERSION,
 		"auth_plugin_mysql_clear_password",
 		MYSQLND_VERSION_ID,
-		MYSQLND_VERSION,
+		PHP_MYSQLND_VERSION,
 		"PHP License 3.01",
 		"Andrey Hristov <andrey@php.net>,  Ulf Wendel <uw@php.net>, Georg Richter <georg@php.net>",
 		{
@@ -627,7 +627,7 @@ static struct st_mysqlnd_authentication_plugin mysqlnd_sha256_authentication_plu
 		MYSQLND_PLUGIN_API_VERSION,
 		"auth_plugin_sha256_password",
 		MYSQLND_VERSION_ID,
-		MYSQLND_VERSION,
+		PHP_MYSQLND_VERSION,
 		"PHP License 3.01",
 		"Andrey Hristov <andrey@mysql.com>,  Ulf Wendel <uwendel@mysql.com>",
 		{
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
index fbc663a465..b9f16e27cb 100644
--- a/ext/mysqlnd/mysqlnd_charset.c
+++ b/ext/mysqlnd/mysqlnd_charset.c
@@ -865,7 +865,7 @@ static struct st_mysqlnd_plugin_charsets mysqlnd_plugin_charsets_plugin =
 		MYSQLND_PLUGIN_API_VERSION,
 		"charsets",
 		MYSQLND_VERSION_ID,
-		MYSQLND_VERSION,
+		PHP_MYSQLND_VERSION,
 		"PHP License 3.01",
 		"Andrey Hristov <andrey@mysql.com>,  Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
 		{
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
index 98d27bd104..96f78ba503 100644
--- a/ext/mysqlnd/mysqlnd_debug.c
+++ b/ext/mysqlnd/mysqlnd_debug.c
@@ -759,7 +759,7 @@ static struct st_mysqlnd_plugin_trace_log mysqlnd_plugin_trace_log_plugin =
 		MYSQLND_PLUGIN_API_VERSION,
 		"debug_trace",
 		MYSQLND_VERSION_ID,
-		MYSQLND_VERSION,
+		PHP_MYSQLND_VERSION,
 		"PHP License 3.01",
 		"Andrey Hristov <andrey@mysql.com>,  Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
 		{
diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c
index e31943ff2e..90da451ae4 100644
--- a/ext/mysqlnd/mysqlnd_driver.c
+++ b/ext/mysqlnd/mysqlnd_driver.c
@@ -38,7 +38,7 @@ static struct st_mysqlnd_plugin_core mysqlnd_plugin_core =
 		MYSQLND_PLUGIN_API_VERSION,
 		"mysqlnd",
 		MYSQLND_VERSION_ID,
-		MYSQLND_VERSION,
+		PHP_MYSQLND_VERSION,
 		"PHP License 3.01",
 		"Andrey Hristov <andrey@mysql.com>,  Ulf Wendel <uwendel@mysql.com>, Georg Richter <georg@mysql.com>",
 		{
diff --git a/ext/mysqlnd/mysqlnd_libmysql_compat.h b/ext/mysqlnd/mysqlnd_libmysql_compat.h
index 6aec8715ce..377cf37cc3 100644
--- a/ext/mysqlnd/mysqlnd_libmysql_compat.h
+++ b/ext/mysqlnd/mysqlnd_libmysql_compat.h
@@ -34,7 +34,7 @@
 #define my_ulonglong			uint64_t
 
 #define MYSQL_VERSION_ID		MYSQLND_VERSION_ID
-#define MYSQL_SERVER_VERSION	MYSQLND_VERSION
+#define MYSQL_SERVER_VERSION	PHP_MYSQLND_VERSION
 #define MYSQL_ERRMSG_SIZE		MYSQLND_ERRMSG_SIZE
 #define SQLSTATE_LENGTH			MYSQLND_SQLSTATE_LENGTH
 
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index bf5cb36007..f90f31980e 100644
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -349,7 +349,7 @@ zend_module_entry mysqlnd_module_entry = {
 	NULL,
 #endif
 	PHP_MINFO(mysqlnd),
-	MYSQLND_VERSION,
+	PHP_MYSQLND_VERSION,
 	PHP_MODULE_GLOBALS(mysqlnd),
 	PHP_GINIT(mysqlnd),
 	NULL,