cleanup mod version macros and mod defs, round x

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 6e37f18287d10f9f277eb1d4dfa25dffed1e0e98..9beb72890f76b09b6507e0081e041e6e6678ede8 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -762,7 +762,7 @@ zend_module_entry pgsql_module_entry = {
        PHP_RINIT(pgsql),
        PHP_RSHUTDOWN(pgsql),
        PHP_MINFO(pgsql),
-       NO_VERSION_YET,
+       PHP_PGSQL_VERSION,
        PHP_MODULE_GLOBALS(pgsql),
        PHP_GINIT(pgsql),
        NULL,

diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index 3e5fcbe851d4394af84211db3ffc2cfec74ca1c2..1b31c75b31a5a04a57c86d2edc0fd93d128a9f7e 100644 (file)
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -29,6 +29,9 @@
 extern zend_module_entry pgsql_module_entry;
 #define pgsql_module_ptr &pgsql_module_entry
 
+#include "php_version.h"
+#define PHP_PGSQL_VERSION PHP_VERSION
+
 #ifdef PHP_PGSQL_PRIVATE
 #undef SOCKET_SIZE_TYPE
 #include <libpq-fe.h>

diff --git a/ext/posix/php_posix.h b/ext/posix/php_posix.h
index de42574b8d8b07a314abe2b9b8228c4d3da95b5c..ced4afe2c65ecd91c1aaae749fc169be80ae7b4b 100644 (file)
--- a/ext/posix/php_posix.h
+++ b/ext/posix/php_posix.h
@@ -34,6 +34,9 @@
 extern zend_module_entry posix_module_entry;
 #define posix_module_ptr &posix_module_entry
 
+#include "php_version.h"
+#define PHP_POSIX_VERSION PHP_VERSION
+
 /* POSIX.1, 3.3 */
 PHP_FUNCTION(posix_kill);
 

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 6a0d4ccc3a7904c692f4e79a42710046c059b271..12fb3f3e362b3ea86afd3f574b7164565eca66a4 100644 (file)
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -360,7 +360,7 @@ zend_module_entry posix_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(posix),
-       NO_VERSION_YET,
+       PHP_POSIX_VERSION,
        PHP_MODULE_GLOBALS(posix),
        PHP_GINIT(posix),
        NULL,

diff --git a/ext/pspell/php_pspell.h b/ext/pspell/php_pspell.h
index 754ebc71ba97d90aa0157a08328eef52988e6726..1f6e3cfcbf635caf0598ea85318876e36ef808e4 100644 (file)
--- a/ext/pspell/php_pspell.h
+++ b/ext/pspell/php_pspell.h
@@ -23,6 +23,10 @@
 #if HAVE_PSPELL
 extern zend_module_entry pspell_module_entry;
 #define pspell_module_ptr &pspell_module_entry
+
+#include "php_version.h"
+#define PHP_PSPELL_VERSION PHP_VERSION
+
 #else
 #define pspell_module_ptr NULL
 #endif

diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c
index 0e9b5c437126caad4e051a92c6bf18e13c4b1afc..a7c42f762184b3479a2e2b8b1e2067748cfef500 100644 (file)
--- a/ext/pspell/pspell.c
+++ b/ext/pspell/pspell.c
@@ -206,7 +206,7 @@ static int le_pspell, le_pspell_config;
 
 zend_module_entry pspell_module_entry = {
     STANDARD_MODULE_HEADER,
-       "pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
+       "pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), PHP_PSPELL_VERSION, STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_PSPELL

diff --git a/ext/readline/php_readline.h b/ext/readline/php_readline.h
index 136f4450b4a6fb2fd09ce7920a0dcfd3ebc59724..dac79f04e756946289df24f6d179a0b09f0ee2a8 100644 (file)
--- a/ext/readline/php_readline.h
+++ b/ext/readline/php_readline.h
@@ -29,6 +29,9 @@
 extern zend_module_entry readline_module_entry;
 #define phpext_readline_ptr &readline_module_entry
 
+#include "php_version.h"
+#define PHP_READLINE_VERSION PHP_VERSION
+
 #else
 
 #define phpext_readline_ptr NULL

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 84b5bd3d660612fe2a31c90ca4ffd90f7f3eb522..3d49f6e96d814a9da78e59582a44bc9d2cdd2981 100644 (file)
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -160,7 +160,7 @@ zend_module_entry readline_module_entry = {
        NULL,
        PHP_RSHUTDOWN(readline),
        PHP_MINFO(readline),
-       PHP_VERSION,
+       PHP_READLINE_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 

diff --git a/ext/recode/php_recode.h b/ext/recode/php_recode.h
index 69931b5718cd92b4703df99f8bb8de836a725d0f..83c021f70164684960f78a66142179562df090ff 100644 (file)
--- a/ext/recode/php_recode.h
+++ b/ext/recode/php_recode.h
@@ -26,6 +26,9 @@
 extern zend_module_entry recode_module_entry;
 #define phpext_recode_ptr &recode_module_entry
 
+#include "php_version.h"
+#define PHP_RECODE_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(recode);
 PHP_MSHUTDOWN_FUNCTION(recode);
 PHP_MINFO_FUNCTION(recode);

diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index 7d9233a374af50ee403c0b5db17c641f17a059e5..d945431636e981232ebc3578c1be0c5eb1806a39 100644 (file)
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -96,7 +96,7 @@ zend_module_entry recode_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(recode),
-       NO_VERSION_YET,
+       PHP_RECODE_VERSION,
        PHP_MODULE_GLOBALS(recode),
        PHP_GINIT(recode),
        NULL,

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 72a88be47c06396606859600ce30cbe1e4425bd5..e78410ec71ffe247f7912682ba88c191e7f19736 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -6233,7 +6233,7 @@ zend_module_entry reflection_module_entry = { /* {{{ */
        NULL,
        NULL,
        PHP_MINFO(reflection),
-       "$Id$",
+       PHP_REFLECTION_VERSION,
        STANDARD_MODULE_PROPERTIES
 }; /* }}} */
 

diff --git a/ext/reflection/php_reflection.h b/ext/reflection/php_reflection.h
index 0579e5a8a7e21b1cbbd91ecf0a829547ccfbb230..1bb47b16c8b51d4e7a2837cd2c928e76012e6e96 100644 (file)
--- a/ext/reflection/php_reflection.h
+++ b/ext/reflection/php_reflection.h
@@ -26,6 +26,8 @@
 extern zend_module_entry reflection_module_entry;
 #define phpext_reflection_ptr &reflection_module_entry
 
+#define PHP_REFLECTION_VERSION PHP_VERSION
+
 BEGIN_EXTERN_C()
 
 /* Class entry pointers */

diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index b575ca08122eb8fbf67e0bf8183eb3c79dc6b438..c6734acfa92284c8e0745687605ed785d3d097a4 100644 (file)
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -29,6 +29,9 @@
 
 #define PHP_SESSION_API 20150121
 
+#include "php_version.h"
+#define PHP_SESSION_VERSION PHP_VERSION
+
 /* save handler macros */
 #define PS_NUM_APIS      9
 #define PS_OPEN_ARGS     void **mod_data, const char *save_path, const char *session_name

diff --git a/ext/session/session.c b/ext/session/session.c
index 0ddf6003bb9bccdd2d73f64d3fcea92ef77d563b..b1582c0e8aee922eecf1a70296be8e0b96965739 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -3015,7 +3015,7 @@ zend_module_entry session_module_entry = {
        PHP_MINIT(session), PHP_MSHUTDOWN(session),
        PHP_RINIT(session), PHP_RSHUTDOWN(session),
        PHP_MINFO(session),
-       NO_VERSION_YET,
+       PHP_SESSION_VERSION,
        PHP_MODULE_GLOBALS(ps),
        PHP_GINIT(ps),
        NULL,

diff --git a/ext/shmop/php_shmop.h b/ext/shmop/php_shmop.h
index 8cb5144001a60e303381858b8b4f2b9f79083102..805f3a380c38217db8c37503230b065a8baedb6c 100644 (file)
--- a/ext/shmop/php_shmop.h
+++ b/ext/shmop/php_shmop.h
@@ -24,6 +24,9 @@
 extern zend_module_entry shmop_module_entry;
 #define phpext_shmop_ptr &shmop_module_entry
 
+#include "php_version.h"
+#define PHP_SHMOP_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(shmop);
 PHP_MINFO_FUNCTION(shmop);
 

diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index 751cb05c0d605ae19b57fcc3589da62ea3ca8511..1b77c35f26490e6c8e2e1d88f631c8a5be6e4853 100644 (file)
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -102,7 +102,7 @@ zend_module_entry shmop_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(shmop),
-       NO_VERSION_YET,
+       PHP_SHMOP_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/simplexml/php_simplexml.h b/ext/simplexml/php_simplexml.h
index 3398232539b7fd3f2e29c9c1d785a01d4e927294..1dec6796de0d7d1c73461e85db9c5eb94f9b3ed4 100644 (file)
--- a/ext/simplexml/php_simplexml.h
+++ b/ext/simplexml/php_simplexml.h
@@ -24,6 +24,9 @@
 extern zend_module_entry simplexml_module_entry;
 #define phpext_simplexml_ptr &simplexml_module_entry
 
+#include "php_version.h"
+#define PHP_SIMPLEXML_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index b125d16f7199c50e6af797a19528f001d982e680..ee21bbfbebf9116d10793acb399c30ccfcc122a6 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -2524,7 +2524,7 @@ zend_module_entry simplexml_module_entry = { /* {{{ */
        NULL,
        NULL,
        PHP_MINFO(simplexml),
-       "0.1",
+       PHP_SIMPLEXML_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index e7cb87096e6e3d6ea52e13bf5c3f5e0e6f04718b..8e89c4d4f91d8b296ccee32f85d094b3b96fe3af 100644 (file)
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -2470,13 +2470,9 @@ static const zend_module_dep snmp_module_deps[] = {
 /* {{{ snmp_module_entry
  */
 zend_module_entry snmp_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050922
        STANDARD_MODULE_HEADER_EX,
        NULL,
        snmp_module_deps,
-#else
-       STANDARD_MODULE_HEADER,
-#endif
        "snmp",
        snmp_functions,
        PHP_MINIT(snmp),

diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h
index 02b734cd3c51c56a1acf30c53928dca527d99f4c..ea3b54ce4d816059fb9c2d0fd8e82758b829a183 100644 (file)
--- a/ext/soap/php_soap.h
+++ b/ext/soap/php_soap.h
@@ -35,9 +35,7 @@
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
 
-#ifndef PHP_HAVE_STREAMS
-# error You lose - must be compiled against PHP 4.3.0 or later
-#endif
+#define PHP_SOAP_VERSION PHP_VERSION
 
 #ifndef PHP_WIN32
 # define TRUE 1

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index ccfb951333c05362fef6646308e7119239fc4aac..ec4a5fd4c42da74d8ced381f0514329e012d608b 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -460,7 +460,7 @@ zend_module_entry soap_module_entry = {
   NULL,
   PHP_MINFO(soap),
 #ifdef STANDARD_MODULE_HEADER
-  NO_VERSION_YET,
+  PHP_SOAP_VERSION,
 #endif
   STANDARD_MODULE_PROPERTIES,
 };

diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 366a34dfec49ba7a3d747724eea8d9763231618c..2e90e120a4ec08df36c9398b0e86be5081e633cd 100644 (file)
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -35,6 +35,8 @@
 # include "windows_common.h"
 #endif
 
+#define PHP_SOCKETS_VERSION PHP_VERSION
+
 extern zend_module_entry sockets_module_entry;
 #define phpext_sockets_ptr &sockets_module_entry
 

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 5f6c17af9a05ba7807c732ae7e4d0aff295ce6e5..45f7c250962cc6999cd8e191abb631cccff37d2a 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -360,7 +360,7 @@ zend_module_entry sockets_module_entry = {
        NULL,
        PHP_RSHUTDOWN(sockets),
        PHP_MINFO(sockets),
-       NO_VERSION_YET,
+       PHP_SOCKETS_VERSION,
        PHP_MODULE_GLOBALS(sockets),
        PHP_GINIT(sockets),
        NULL,

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 78bdd6744ffbf93224966e842fd833cf87e66e0b..917411ab6faef0c9ff38c36c7232f7c26e9db712 100644 (file)
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -956,7 +956,7 @@ zend_module_entry spl_module_entry = {
        PHP_RINIT(spl),
        PHP_RSHUTDOWN(spl),
        PHP_MINFO(spl),
-       "0.2",
+       PHP_SPL_VERSION,
        PHP_MODULE_GLOBALS(spl),
        PHP_GINIT(spl),
        NULL,

diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h
index 5a0f4be3846c4e8b8b6bed3de530d9b552a3b89e..015ada4ac2bf5569da9bd9254263179cfa33dcbc 100644 (file)
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
@@ -22,6 +22,8 @@
 #include "php.h"
 #include <stdarg.h>
 
+#define PHP_SPL_VERSION PHP_VERSION
+
 #if 0
 #define SPL_DEBUG(x)   x
 #else

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 5c103df735cd496d328c8fdf414d8af6997c397e..4c3e8331889b74c374dfbbc13b157e41a11f40cf 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3372,7 +3372,7 @@ zend_module_entry basic_functions_module = { /* {{{ */
        PHP_RINIT(basic),                       /* request startup */
        PHP_RSHUTDOWN(basic),           /* request shutdown */
        PHP_MINFO(basic),                       /* extension info */
-       PHP_VERSION,                            /* extension version */
+       PHP_STANDARD_VERSION,           /* extension version */
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/standard/php_standard.h b/ext/standard/php_standard.h
index 9038c9de45f13e39ef5b450983c9676562aa3456..545406bef7223e39357769a09583dd9b544c23e1 100644 (file)
--- a/ext/standard/php_standard.h
+++ b/ext/standard/php_standard.h
@@ -60,6 +60,9 @@
 #include "php_type.h"
 #include "php_password.h"
 
+#include "php_version.h"
+#define PHP_STANDARD_VERSION PHP_VERSION
+
 #define phpext_standard_ptr basic_functions_module_ptr
 PHP_MINIT_FUNCTION(standard_filters);
 PHP_MSHUTDOWN_FUNCTION(standard_filters);

diff --git a/ext/sysvmsg/php_sysvmsg.h b/ext/sysvmsg/php_sysvmsg.h
index 6a327349108a7b6cb20df557a1c21abde200e045..8ee9aa97dbdd91b29e4d5fefa85b2857b30af3df 100644 (file)
--- a/ext/sysvmsg/php_sysvmsg.h
+++ b/ext/sysvmsg/php_sysvmsg.h
@@ -26,6 +26,9 @@
 extern zend_module_entry sysvmsg_module_entry;
 #define phpext_sysvmsg_ptr &sysvmsg_module_entry
 
+#include "php_version.h"
+#define PHP_SYSVMSG_VERSION PHP_VERSION
+
 #ifndef __USE_GNU
 /* we want to use mtype instead of __mtype */
 #define __USE_GNU

diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index 7f4682c92e6a12fff5bb1d1d2ed06ff2b5a5f156..80fd7e940f3bf15dda00f01a9cd1ccd4f6ef2569 100644 (file)
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -110,7 +110,7 @@ zend_module_entry sysvmsg_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(sysvmsg),
-       NO_VERSION_YET,
+       PHP_SYSVMSG_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/sysvsem/php_sysvsem.h b/ext/sysvsem/php_sysvsem.h
index adca9fd3c2de562c3e72dc61e0481c8cc412cedd..f7a40b56772d2beb30f619b8a3fd8fa7c663bfe2 100644 (file)
--- a/ext/sysvsem/php_sysvsem.h
+++ b/ext/sysvsem/php_sysvsem.h
@@ -26,6 +26,9 @@
 extern zend_module_entry sysvsem_module_entry;
 #define sysvsem_module_ptr &sysvsem_module_entry
 
+#include "php_version.h"
+#define PHP_SYSVSEM_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(sysvsem);
 PHP_FUNCTION(sem_get);
 PHP_FUNCTION(sem_acquire);

diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index 647d59191ccb748070318ac25122d4cf3dd94012..3b3290a7de665d7c56b04545aad7aeccb8220402 100644 (file)
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -100,7 +100,7 @@ zend_module_entry sysvsem_module_entry = {
        NULL,
        NULL,
        NULL,
-       NO_VERSION_YET,
+       PHP_SYSVSEM_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/sysvshm/php_sysvshm.h b/ext/sysvshm/php_sysvshm.h
index edd4e6dbc6b4f4b6f891bd6662b8c970b06cc3f0..72e09b71eca7ca49634434d459b8e928492ee376 100644 (file)
--- a/ext/sysvshm/php_sysvshm.h
+++ b/ext/sysvshm/php_sysvshm.h
@@ -26,6 +26,9 @@
 extern zend_module_entry sysvshm_module_entry;
 #define sysvshm_module_ptr &sysvshm_module_entry
 
+#include "php_version.h"
+#define PHP_SYSVSHM_VERSION PHP_VERSION
+
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>

diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index fb03e950db84c58b212710327033fc897eea0b99..ac90b4749601ae419c8865ea9704963c77fceb6b 100644 (file)
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -101,7 +101,7 @@ zend_module_entry sysvshm_module_entry = {
        NULL,
        NULL,
        NULL,
-       NO_VERSION_YET,
+       PHP_SYSVSHM_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h
index 8f4ecf8750897cc3bc7c70c9b94fd0654ff857ba..76d42e45667a2ebaf040104c68d1b3401c9d26c7 100644 (file)
--- a/ext/tidy/php_tidy.h
+++ b/ext/tidy/php_tidy.h
@@ -24,6 +24,9 @@
 extern zend_module_entry tidy_module_entry;
 #define phpext_tidy_ptr &tidy_module_entry
 
+#include "php_version.h"
+#define PHP_TIDY_VERSION PHP_VERSION
+
 #define TIDY_METHOD_MAP(name, func_name, arg_types) \
        ZEND_NAMED_FE(name, ZEND_FN(func_name), arg_types)
 #define TIDY_NODE_METHOD(name)    PHP_FUNCTION(tnm_ ##name)

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 59859579902d2a43e4f84ce68246678ce14d396b..f6b987d5b2cd618befb7905a8d6c2f70a9231698 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -38,8 +38,6 @@
 #define TIDY_CALL
 #endif
 
-#define PHP_TIDY_MODULE_VERSION        "2.0"
-
 /* {{{ ext/tidy macros
 */
 #define FIX_BUFFER(bptr) do { if ((bptr)->size) { (bptr)->bp[(bptr)->size-1] = '\0'; } } while(0)
@@ -458,7 +456,7 @@ zend_module_entry tidy_module_entry = {
        PHP_RINIT(tidy),
        NULL,
        PHP_MINFO(tidy),
-       PHP_TIDY_MODULE_VERSION,
+       PHP_TIDY_VERSION,
        PHP_MODULE_GLOBALS(tidy),
        NULL,
        NULL,
@@ -1077,7 +1075,7 @@ static PHP_MINFO_FUNCTION(tidy)
        php_info_print_table_start();
        php_info_print_table_header(2, "Tidy support", "enabled");
        php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate());
-       php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id$)");
+       php_info_print_table_row(2, "Extension Version", PHP_TIDY_VERSION " ($Id$)");
        php_info_print_table_end();
 
        DISPLAY_INI_ENTRIES();

diff --git a/ext/tokenizer/php_tokenizer.h b/ext/tokenizer/php_tokenizer.h
index 3097f115da1d19ff154f0c5608415f0da0cbc093..ec042192fc0f387579ae44c6987783426c31556f 100644 (file)
--- a/ext/tokenizer/php_tokenizer.h
+++ b/ext/tokenizer/php_tokenizer.h
@@ -24,6 +24,9 @@
 extern zend_module_entry tokenizer_module_entry;
 #define phpext_tokenizer_ptr &tokenizer_module_entry
 
+#include "php_version.h"
+#define PHP_TOKENIZER_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
index aaab111c6a87e64d8a4e71c958f41f852469a650..52095d077dc0792c9b0716570e099184f7ebb9c1 100644 (file)
--- a/ext/tokenizer/tokenizer.c
+++ b/ext/tokenizer/tokenizer.c
@@ -61,9 +61,7 @@ const zend_function_entry tokenizer_functions[] = {
 /* {{{ tokenizer_module_entry
  */
 zend_module_entry tokenizer_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
        STANDARD_MODULE_HEADER,
-#endif
        "tokenizer",
        tokenizer_functions,
        PHP_MINIT(tokenizer),
@@ -71,9 +69,7 @@ zend_module_entry tokenizer_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(tokenizer),
-#if ZEND_MODULE_API_NO >= 20010901
-       "0.1", /* Replace with version number for your extension */
-#endif
+       PHP_TOKENIZER_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/wddx/php_wddx.h b/ext/wddx/php_wddx.h
index c9a7598f832b9b9bcf27ba6234a441d16e8cfafa..480f4c0488f0bb5f58317eaf235ed673f656ffe7 100644 (file)
--- a/ext/wddx/php_wddx.h
+++ b/ext/wddx/php_wddx.h
@@ -26,6 +26,9 @@
 extern zend_module_entry wddx_module_entry;
 #define wddx_module_ptr &wddx_module_entry
 
+#include "php_version.h"
+#define PHP_WDDX_VERSION PHP_VERSION
+
 PHP_FUNCTION(wddx_serialize_value);
 PHP_FUNCTION(wddx_serialize_vars);
 PHP_FUNCTION(wddx_packet_start);

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 235efcdd18ae23722cec02da3ea61ab91b844b88..c0dc964e573b0feb01dc76d58ee4d4b0b016175d 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -163,7 +163,7 @@ zend_module_entry wddx_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(wddx),
-    NO_VERSION_YET,
+    PHP_WDDX_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index 44815d979cea1b30334f6caa03e4bd24138e742c..c8eb3cf6d183b99012fdeb25ad8ee3c240f0ab84 100644 (file)
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -26,6 +26,10 @@
 #ifdef HAVE_XML
 extern zend_module_entry xml_module_entry;
 #define xml_module_ptr &xml_module_entry
+
+#include "php_version.h"
+#define PHP_XML_VERSION PHP_VERSION
+
 #else
 #define xml_module_ptr NULL
 #endif

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index f5756ef0b3be178fbf087c2e5ce4134b47f07d9c..386d8ed587d3908f949013030a7ebd0d2f49129f 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -265,7 +265,7 @@ zend_module_entry xml_module_entry = {
        NULL,                 /* per-request startup function */
        NULL,                 /* per-request shutdown function */
        PHP_MINFO(xml),       /* information function */
-    NO_VERSION_YET,
+    PHP_XML_VERSION,
     PHP_MODULE_GLOBALS(xml), /* globals descriptor */
     PHP_GINIT(xml),          /* globals ctor */
     NULL,                    /* globals dtor */

diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index 338682702e096577fc80b7f4d030364819b3ccfe..f636903e902c131f44e8a51cb75b580c79f319fe 100644 (file)
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -332,7 +332,7 @@ zend_module_entry xmlreader_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(xmlreader),
-       "0.1", /* Replace with version number for your extension */
+       PHP_XMLREADER_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h
index 3f7bf3d64e780eeed14370d4987b4a8c0fbbe196..c5cc22cf5738b163873e1a86c59267c08ebda326 100644 (file)
--- a/ext/xmlreader/php_xmlreader.h
+++ b/ext/xmlreader/php_xmlreader.h
@@ -24,6 +24,9 @@
 extern zend_module_entry xmlreader_module_entry;
 #define phpext_xmlreader_ptr &xmlreader_module_entry
 
+#include "php_version.h"
+#define PHP_XMLREADER_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

diff --git a/ext/xmlrpc/php_xmlrpc.h b/ext/xmlrpc/php_xmlrpc.h
index e153cc57d7db73cd9f4ed212ac33932f75c6c6ca..2adfb71346dc6b91308fbd504eae5c9e0b7e97ed 100644 (file)
--- a/ext/xmlrpc/php_xmlrpc.h
+++ b/ext/xmlrpc/php_xmlrpc.h
@@ -61,6 +61,9 @@
 extern zend_module_entry xmlrpc_module_entry;
 #define phpext_xmlrpc_ptr &xmlrpc_module_entry
 
+#include "php_version.h"
+#define PHP_XMLRPC_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(xmlrpc);
 PHP_MINFO_FUNCTION(xmlrpc);
 

diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 228cbc4c03cd6229bf0c871682ed418bed6e69dd..1d3de75d6d90dd6c421fb207d031349f7e18c078 100644 (file)
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -73,8 +73,6 @@
 #include "php_xmlrpc.h"
 #include "xmlrpc.h"
 
-#define PHP_EXT_VERSION "0.51"
-
 static int le_xmlrpc_server;
 
 /* {{{ arginfo */
@@ -170,7 +168,7 @@ zend_module_entry xmlrpc_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(xmlrpc),
-       PHP_EXT_VERSION,
+       PHP_XMLRPC_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 
@@ -300,7 +298,7 @@ PHP_MINFO_FUNCTION(xmlrpc)
 {
        php_info_print_table_start();
        php_info_print_table_row(2, "core library version", XMLRPC_GetVersionString());
-       php_info_print_table_row(2, "php extension version", PHP_EXT_VERSION);
+       php_info_print_table_row(2, "php extension version", PHP_XMLRPC_VERSION);
        php_info_print_table_row(2, "author", "Dan Libby");
        php_info_print_table_row(2, "homepage", "http://xmlrpc-epi.sourceforge.net");
        php_info_print_table_row(2, "open sourced by", "Epinions.com");

diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index f2e458f64f54ea76afa96459fa05b49d764dc156..122ed0c31eb0a2ad0a3cb0735adebe366c14ffd3 100644 (file)
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -664,7 +664,7 @@ zend_module_entry xmlwriter_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(xmlwriter),
-       "0.1",
+       PHP_XMLWRITER_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/xmlwriter/php_xmlwriter.h b/ext/xmlwriter/php_xmlwriter.h
index 5e6723b5a9c43a87a9408d1231074a78310e7c6d..ff4a6b8617a35f798b849bc3a665f89f6080752e 100644 (file)
--- a/ext/xmlwriter/php_xmlwriter.h
+++ b/ext/xmlwriter/php_xmlwriter.h
@@ -25,6 +25,9 @@
 extern zend_module_entry xmlwriter_module_entry;
 #define phpext_xmlwriter_ptr &xmlwriter_module_entry
 
+#include "php_version.h"
+#define PHP_XMLWRITER_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c
index d89b4cbd33f60aabbfd346832dc1a1102ad4c09f..60338bb997eca51e0f95612bc1c28f78a5a36532 100644 (file)
--- a/ext/xsl/php_xsl.c
+++ b/ext/xsl/php_xsl.c
@@ -47,12 +47,8 @@ static const zend_module_dep xsl_deps[] = {
 /* {{{ xsl_module_entry
  */
 zend_module_entry xsl_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050617
        STANDARD_MODULE_HEADER_EX, NULL,
        xsl_deps,
-#elif ZEND_MODULE_API_NO >= 20010901
-       STANDARD_MODULE_HEADER,
-#endif
        "xsl",
        xsl_functions,
        PHP_MINIT(xsl),
@@ -60,9 +56,7 @@ zend_module_entry xsl_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(xsl),
-#if ZEND_MODULE_API_NO >= 20010901
-       "0.1", /* Replace with version number for your extension */
-#endif
+       PHP_XSL_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/xsl/php_xsl.h b/ext/xsl/php_xsl.h
index 38715eb8af8b2a57dcbdbcb7c59ef3f24a7ae998..4250ae83d69551cba56cb5253d5fcb3a5a1bdc3f 100644 (file)
--- a/ext/xsl/php_xsl.h
+++ b/ext/xsl/php_xsl.h
@@ -24,6 +24,9 @@
 extern zend_module_entry xsl_module_entry;
 #define phpext_xsl_ptr &xsl_module_entry
 
+#include "php_version.h"
+#define PHP_XSL_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 2a8e443eba17a386687399007bf1f0f62076aa47..6da5e2e5430444d5befe00cc9adc7446d8593a21 100644 (file)
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -23,6 +23,9 @@
 #ifndef PHP_ZLIB_H
 #define PHP_ZLIB_H
 
+#include "php_version.h"
+#define PHP_ZLIB_VERSION PHP_VERSION
+
 #include <zlib.h>
 
 #define PHP_ZLIB_ENCODING_RAW          -0xf

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index b638ab43775aaaa07b55984bd386dff49bd23e20..0cb94fe6e478eb1616cb56b3196ddcddb0668555 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1037,7 +1037,7 @@ zend_module_entry php_zlib_module_entry = {
        PHP_RINIT(zlib),
        PHP_RSHUTDOWN(zlib),
        PHP_MINFO(zlib),
-       "2.0",
+       PHP_ZLIB_VERSION,
        PHP_MODULE_GLOBALS(zlib),
        PHP_GINIT(zlib),
        NULL,