cleanup the mod version macros, round 2

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 9c252f45fc4352b2f4ee62508c334a1998fd47d2..fec29d7519bed48b8d58505c1dd480e0f130f145 100644 (file)
--- 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 d008e49a76cb652e032fb95b38140c491d0fa55c..2af7887ebcec2ed2e9ee140d41b43e3f1fb7af52 100644 (file)
--- 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 0cd7359fc37989c02c535670b83dd7bc9136b165..91c2abb0eba799a282e208a2636e2b2bd1dfba59 100644 (file)
--- 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 b8a6030bcd1664ae6bb9578048cf5317679d1808..d17a6817ba53e3b8b6b42ff56ddac1d645644fe0 100644 (file)
--- 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 45b86b2932f7b6c9c3045b9f328928d204764e9a..95839346799613d1cc674a02680fcdb4a655881a 100644 (file)
--- 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 ca3f404d68f7d643129a8b7d4c9491496819f13c..2ca592907e295c2793fa3afb44ff2e66117077d1 100644 (file)
--- 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 1975d2dbc9c71e28fec6a98ac4a2974bb55be3ec..d9c3a892d918c9cd2b94076d1daa6cd3806a34ae 100644 (file)
--- 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 0c3a8153cb7f18ebd3bc10070e4aada0a8c7eabe..c8104710baf4ad3b1be0f2bb163b4f5e8ab848b3 100644 (file)
--- 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 7621ce75aca5a530ec4f86ab339c648418e13bd0..638160cb690f35a703666a0cc151cab30a6f4b23 100644 (file)
--- 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 527f497a6aa0a1f5629a16ff9ef124355ee7e616..1dc25de9dd5729c32f4d3fc3fd8fb5af8d95e26c 100644 (file)
--- 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 b5febac64da35a1ef6f063c66fe39d09bc5dba4d..55b1bac904fc21cd330018bd320fda1b5e3010dc 100644 (file)
--- 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 a697a26b700647afaf231a3b565767cc9f2f81bc..eb87a04e47059cc792f3be8a8d6ae5185b05e502 100644 (file)
--- 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 1cb0be5d5a25c8390e0f33d02d2c88bed2aeb079..919ea7de5e9457ac8f3a2048f257ff775ed12eb7 100644 (file)
--- 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 65e1fa8c0b0d35cf1a82c5e24f4b1e6cc3b910da..3e21f07f5a81e25cc393e783bc60c1a81e4bb9e0 100644 (file)
--- 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 8b05b58d2a1b2b8ae724c718894278272a87656d..e20816e34e965e1dcbe244d035cf111f6259fa11 100644 (file)
--- 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 22f4d89ce1a1fd44b67e2528e602c4c8251c9f4d..6ad3a936005748c5207fdf0c2a59a65d066cc0f9 100644 (file)
--- 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 4ae38b2237995275d1e9124a8d51b774728a6307..bce1d6f7aa7cd86db7a1d78ec01dff5be549c618 100644 (file)
--- 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 52f5dabe69a26386235c53cff087065f7f875aa2..b96d25aa806d93b85a8e446405b8d13a21692ea8 100644 (file)
--- 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 39a140c516563f48271c1e6394aaccf7a55bf527..5a68a57494dfadbd3118b48fb7aa823ab94fdc65 100644 (file)
--- 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 6d1cd4f33599bb890b77148d06ef0289bcfee850..857ad7097e129a3725847e5b6964d2b12b05d798 100644 (file)
--- 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 9685c64d7b4a96ba449a98beea792db161a86d59..2dffb6370595ef2883f7c8776167b8a781a6a74e 100644 (file)
--- 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 399c6313b95655502d54a828bc4c0325f0ee4155..1cdedd596a163052f409d7956c02afa4c4f5ff59 100644 (file)
--- 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 acc74e53c0908330d27a2d7b37a1ab561c142113..f29eec72d75c73f1303c4c67bda9d925c44ea68c 100644 (file)
--- 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 f72a38b294ff7eea8ba054fea7b977c5d53b7fe4..9bc81769d5bc28703f22099320f927bb5e779ced 100644 (file)
--- 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 efae22be0e855fef80527e8dce3f6811eac202b3..3cfc8fa847c41477d7612498bbd69fa2f142b9ea 100644 (file)
--- 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 5af0e8d8f9810a004bf376fa6ebf5450fff27dd3..b1a84217f231b825efdb9197985d364af4c72658 100644 (file)
--- 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 44f48b4b72aeccac211f28daaa9588978ea2d096..2e284ca1a5c9d729604f171bb64ed1158673b6e3 100644 (file)
--- 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 20225c9a37af49b2250d8bd167dcfc6cab291617..e9eb773f9ca6fa91f78ca2c743586110e9c141bc 100644 (file)
--- 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 fbc663a46516d844d39532f72791ee96efbb1f0c..b9f16e27cb8af868e4d55db1ffe8170d3619016a 100644 (file)
--- 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 98d27bd10418c0f35e9050bb64bd9cc468eb5d51..96f78ba503b556a4087f910ab01564e4aac54d86 100644 (file)
--- 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 e31943ff2e71f0c9d221b7345f06c0be0a5a1922..90da451ae4232a0642ba6d101bdb0999b7ad6a14 100644 (file)
--- 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 6aec8715ce55f91305cc5b8be003f1b603a7a379..377cf37cc3f3fda24894556d0de80933a36bab20 100644 (file)
--- 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 bf5cb360075da741b02891d0b7a4da34592e6c57..f90f31980e96674e88e36b390eef9e6e1c2d4160 100644 (file)
--- 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,