cleanup mod version macros, round 3

diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c
index 54ae0e76e20d6aa3f6bc0be2f2d569aa38a0190e..a1c8ffa7f8e8b86354aaf51cc76f76a53558bc05 100644 (file)
--- a/ext/odbc/birdstep.c
+++ b/ext/odbc/birdstep.c
@@ -148,7 +148,7 @@ zend_module_entry birdstep_module_entry = {
        PHP_RINIT(birdstep),
        NULL,
        PHP_MINFO(birdstep),
-       NO_VERSION_YET,
+       PHP_BIRDSTEP_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 

diff --git a/ext/odbc/php_birdstep.h b/ext/odbc/php_birdstep.h
index abf0b716c37eb03a462439425ecca0ce4393d800..9a8502cbf2fdd6c435dd6c7b3cc69825de458c4b 100644 (file)
--- a/ext/odbc/php_birdstep.h
+++ b/ext/odbc/php_birdstep.h
@@ -26,6 +26,9 @@
 #include <sql.h>
 #include <sqlext.h>
 
+#include "php_version.h"
+#define PHP_BIRDSTEP_VERSION PHP_VERSION
+
 typedef struct VConn {
        HDBC    hdbc;
        zend_long    index;

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 8d594c11e767b29fb0e9283e5839e3935c7cb6e6..1f14ee23c7c9b3215d1b4197e30c326a84d805ac 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -401,7 +401,7 @@ zend_module_entry odbc_module_entry = {
        PHP_RINIT(odbc), 
        PHP_RSHUTDOWN(odbc), 
        PHP_MINFO(odbc), 
-       "1.0",
+       PHP_ODBC_VERSION,
        PHP_MODULE_GLOBALS(odbc),
        PHP_GINIT(odbc),
        NULL,

diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
index 8e43d298b0628759f06449044e42d4287b2349f4..857397b4678ab80892230311a1a91b18ac0772ef 100644 (file)
--- a/ext/odbc/php_odbc.h
+++ b/ext/odbc/php_odbc.h
@@ -32,6 +32,9 @@
 extern zend_module_entry odbc_module_entry;
 #define odbc_module_ptr &odbc_module_entry
 
+#include "php_version.h"
+#define PHP_ODBC_VERSION PHP_VERSION
+
 #if defined(HAVE_DBMAKER) || defined(PHP_WIN32) || defined(HAVE_IBMDB2) || defined(HAVE_UNIXODBC) || defined(HAVE_BIRDSTEP) || defined(HAVE_IODBC)
 # define PHP_ODBC_HAVE_FETCH_HASH 1
 #endif

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 2b6ee3e6b40a415fe6c7cd10ec68fbeb96938134..704f119e1d8390df3d1747c181ae6528fcbdd7ec 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -525,7 +525,7 @@ zend_module_entry openssl_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(openssl),
-       NO_VERSION_YET,
+       PHP_OPENSSL_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h
index 5edb0b88fcfe19d20c89982c0b02acbea40892ed..804e5cf25a16ed4ef3d046dd8736cbe0e5b7859e 100644 (file)
--- a/ext/openssl/php_openssl.h
+++ b/ext/openssl/php_openssl.h
@@ -26,6 +26,9 @@
 extern zend_module_entry openssl_module_entry;
 #define phpext_openssl_ptr &openssl_module_entry
 
+#include "php_version.h"
+#define PHP_OPENSSL_VERSION PHP_VERSION
+
 #define OPENSSL_RAW_DATA 1
 #define OPENSSL_ZERO_PADDING 2
 

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 8cb2617bc45e0bd7d56c9b7440fb347fa37c263c..4842e1af44edacd7df6e76a7a83505146d490c6a 100644 (file)
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -193,7 +193,7 @@ zend_module_entry pcntl_module_entry = {
        PHP_RINIT(pcntl),
        PHP_RSHUTDOWN(pcntl),
        PHP_MINFO(pcntl),
-       NO_VERSION_YET,
+       PHP_PCNTL_VERSION,
        PHP_MODULE_GLOBALS(pcntl),
        PHP_GINIT(pcntl),
        NULL,

diff --git a/ext/pcntl/php_pcntl.h b/ext/pcntl/php_pcntl.h
index b9af84b9ee714578a141301dd5c6a148acb770c6..68f2983a24def257ee6e487bd4a46d51375eac6d 100644 (file)
--- a/ext/pcntl/php_pcntl.h
+++ b/ext/pcntl/php_pcntl.h
@@ -26,6 +26,9 @@
 extern zend_module_entry pcntl_module_entry;
 #define phpext_pcntl_ptr &pcntl_module_entry
 
+#include "php_version.h"
+#define PHP_PCNTL_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(pcntl);
 PHP_MSHUTDOWN_FUNCTION(pcntl);
 PHP_RINIT_FUNCTION(pcntl);

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 06f617988402246e4ab4cf9f0baa74cda7eaa7f0..117d288bb75765709c933cb11e6f5667b67961f0 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -2127,7 +2127,7 @@ zend_module_entry pcre_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(pcre),
-       NO_VERSION_YET,
+       PHP_PCRE_VERSION,
        PHP_MODULE_GLOBALS(pcre),
        PHP_GINIT(pcre),
        PHP_GSHUTDOWN(pcre),

diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h
index 88f810493ff0064b13e3c9e7865ae3524d40f4d2..98882cce4e1ce012c48e9af580b54ac601983024 100644 (file)
--- a/ext/pcre/php_pcre.h
+++ b/ext/pcre/php_pcre.h
@@ -40,6 +40,9 @@ PHPAPI pcre* pcre_get_compiled_regex_ex(zend_string *regex, pcre_extra **extra,
 extern zend_module_entry pcre_module_entry;
 #define pcre_module_ptr &pcre_module_entry
 
+#include "php_version.h"
+#define PHP_PCRE_VERSION PHP_VERSION
+
 typedef struct {
        pcre *re;
        pcre_extra *extra;

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 00ed81469649aa32408fb26e6e4630ffea98cf06..61055e6193233800dd2235600490a736c01c8b35 100644 (file)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -140,12 +140,8 @@ static const zend_module_dep pdo_deps[] = {
 
 /* {{{ pdo_module_entry */
 zend_module_entry pdo_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050922
        STANDARD_MODULE_HEADER_EX, NULL,
        pdo_deps,
-#else
-       STANDARD_MODULE_HEADER,
-#endif
        "PDO",
        pdo_functions,
        PHP_MINIT(pdo),
@@ -153,7 +149,7 @@ zend_module_entry pdo_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(pdo),
-       "1.0.4dev",
+       PHP_PDO_VERSION,
        PHP_MODULE_GLOBALS(pdo),
        PHP_GINIT(pdo),
        NULL,

diff --git a/ext/pdo/php_pdo.h b/ext/pdo/php_pdo.h
index 71ec3693db7571b1834432df695e20ad81211a47..c9217dfffba5729a73902e2d70ad3fdd508f1021 100644 (file)
--- a/ext/pdo/php_pdo.h
+++ b/ext/pdo/php_pdo.h
@@ -26,6 +26,9 @@
 extern zend_module_entry pdo_module_entry;
 #define phpext_pdo_ptr &pdo_module_entry
 
+#include "php_version.h"
+#define PHP_PDO_VERSION PHP_VERSION
+
 #ifdef PHP_WIN32
 #      if defined(PDO_EXPORTS) || (!defined(COMPILE_DL_PDO))
 #              define PDO_API __declspec(dllexport)

diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c
index c22269f24508a28fff75e90ee2b78833fce23e00..58ef3e270cb237512f4cb4a1b9a1e9fdd298e37f 100644 (file)
--- a/ext/pdo_dblib/pdo_dblib.c
+++ b/ext/pdo_dblib/pdo_dblib.c
@@ -70,7 +70,7 @@ zend_module_entry pdo_dblib_module_entry = {
        NULL,
        PHP_RSHUTDOWN(pdo_dblib),
        PHP_MINFO(pdo_dblib),
-       "1.0.1",
+       PHP_PDO_DBLIB_VERSION,
        PHP_MODULE_GLOBALS(dblib),
        PHP_GINIT(dblib),
        NULL,

diff --git a/ext/pdo_dblib/php_pdo_dblib.h b/ext/pdo_dblib/php_pdo_dblib.h
index a8b1aa2b65823f93e2c96e0cebaf2ff65e17e8bd..740ba21029832fe4d98283b3d6e07f705bfb56a1 100644 (file)
--- a/ext/pdo_dblib/php_pdo_dblib.h
+++ b/ext/pdo_dblib/php_pdo_dblib.h
@@ -30,6 +30,9 @@ extern zend_module_entry pdo_dblib_module_entry;
 #define phpext_pdo_dblib_ptr &pdo_dblib_module_entry
 #endif
 
+#include "php_version.h"
+#define PHP_PDO_DBLIB_VERSION PHP_VERSION
+
 #ifdef ZTS
 # include "TSRM.h"
 #endif

diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c
index 2d4d69d139352b61ed065dc8a2dbe3e1d4e83cc5..4b75e4b6bfaa82a65499f5dca4a56bb5a2a3543d 100644 (file)
--- a/ext/pdo_firebird/pdo_firebird.c
+++ b/ext/pdo_firebird/pdo_firebird.c
@@ -51,7 +51,7 @@ zend_module_entry pdo_firebird_module_entry = { /* {{{ */
        NULL,
        NULL,
        PHP_MINFO(pdo_firebird),
-       "0.3",
+       PHP_PDO_FIREBIRD_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/pdo_firebird/php_pdo_firebird.h b/ext/pdo_firebird/php_pdo_firebird.h
index 3939bb90c82d937471811df386e8439ad0fa09aa..185ff14853ee524c29a0d40a3eceec61cd8b9acd 100644 (file)
--- a/ext/pdo_firebird/php_pdo_firebird.h
+++ b/ext/pdo_firebird/php_pdo_firebird.h
@@ -22,6 +22,9 @@
 extern zend_module_entry pdo_firebird_module_entry;
 #define phpext_pdo_firebird_ptr &pdo_firebird_module_entry
 
+#include "php_version.h"
+#define PHP_PDO_FIREBIRD_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 701137a2a51a98fb89c5b7c2bdf7bbf08e68880d..6adf3b11c0e188056f255d9eb5ee61cef298ff6b 100644 (file)
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -256,7 +256,7 @@ zend_module_entry pdo_mysql_module_entry = {
        NULL,
 #endif
        PHP_MINFO(pdo_mysql),
-       "1.0.2",
+       PHP_PDO_MYSQL_VERSION,
        PHP_MODULE_GLOBALS(pdo_mysql),
        PHP_GINIT(pdo_mysql),
        NULL,

diff --git a/ext/pdo_mysql/php_pdo_mysql.h b/ext/pdo_mysql/php_pdo_mysql.h
index a70190b66ad81aef208fc9bdbe02d89a62c91f81..78b16ef861bf859afd8f40ebf7925e2c6ef3512d 100644 (file)
--- a/ext/pdo_mysql/php_pdo_mysql.h
+++ b/ext/pdo_mysql/php_pdo_mysql.h
@@ -24,6 +24,9 @@
 extern zend_module_entry pdo_mysql_module_entry;
 #define phpext_pdo_mysql_ptr &pdo_mysql_module_entry
 
+#include "php_version.h"
+#define PHP_PDO_MYSQL_VERSION PHP_VERSION
+
 #ifdef PHP_WIN32
 #define PHP_PDO_MYSQL_API __declspec(dllexport)
 #else

diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c
index 379107eb60cd360df08a14ed302b29fc2da2d4d4..e6e9505c9d3c11502428a9b7495431c02cd0a4b4 100644 (file)
--- a/ext/pdo_oci/pdo_oci.c
+++ b/ext/pdo_oci/pdo_oci.c
@@ -46,12 +46,8 @@ static const zend_module_dep pdo_oci_deps[] = {
 #endif
 
 zend_module_entry pdo_oci_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050922
        STANDARD_MODULE_HEADER_EX, NULL,
        pdo_oci_deps,
-#else
-       STANDARD_MODULE_HEADER,
-#endif
        "PDO_OCI",
        pdo_oci_functions,
        PHP_MINIT(pdo_oci),
@@ -59,7 +55,7 @@ zend_module_entry pdo_oci_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(pdo_oci),
-       "1.0.1",
+       PHP_PDO_OCI_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/pdo_oci/php_pdo_oci.h b/ext/pdo_oci/php_pdo_oci.h
index a9cc8cb0b2e0d76e886d55e805147ebf99bf1987..aae58ae1ec3fe04cc9ecfe24af123bf90ac6e6b3 100644 (file)
--- a/ext/pdo_oci/php_pdo_oci.h
+++ b/ext/pdo_oci/php_pdo_oci.h
@@ -24,6 +24,9 @@
 extern zend_module_entry pdo_oci_module_entry;
 #define phpext_pdo_oci_ptr &pdo_oci_module_entry
 
+#include "php_version.h"
+#define PHP_PDO_OCI_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c
index 924adb04a918551d9fe7f0e695730244273da13f..7f164340097f9df566a44afe07f1bbbb377c2408 100644 (file)
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
@@ -47,12 +47,8 @@ static const zend_module_dep pdo_odbc_deps[] = {
 
 /* {{{ pdo_odbc_module_entry */
 zend_module_entry pdo_odbc_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050922
        STANDARD_MODULE_HEADER_EX, NULL,
        pdo_odbc_deps,
-#else
-       STANDARD_MODULE_HEADER,
-#endif
        "PDO_ODBC",
        pdo_odbc_functions,
        PHP_MINIT(pdo_odbc),
@@ -60,7 +56,7 @@ zend_module_entry pdo_odbc_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(pdo_odbc),
-       "1.0.1",
+       PHP_PDO_ODBC_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/pdo_odbc/php_pdo_odbc.h b/ext/pdo_odbc/php_pdo_odbc.h
index b7a23eada755673aca05ffd0da21944d66844a18..fb0be1b0b9576ff22eb7ba1b0f8c5f93c905a1f8 100644 (file)
--- a/ext/pdo_odbc/php_pdo_odbc.h
+++ b/ext/pdo_odbc/php_pdo_odbc.h
@@ -24,6 +24,9 @@
 extern zend_module_entry pdo_odbc_module_entry;
 #define phpext_pdo_odbc_ptr &pdo_odbc_module_entry
 
+#include "php_version.h"
+#define PHP_PDO_ODBC_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

diff --git a/ext/pdo_pgsql/pdo_pgsql.c b/ext/pdo_pgsql/pdo_pgsql.c
index b5ee8d2551aa397e1578b716f516e1a61df245bc..abb0ee1c39786b7aa3ae6455545323c1f1dada6a 100644 (file)
--- a/ext/pdo_pgsql/pdo_pgsql.c
+++ b/ext/pdo_pgsql/pdo_pgsql.c
@@ -57,12 +57,8 @@ static const zend_module_dep pdo_pgsql_deps[] = {
 
 /* {{{ pdo_pgsql_module_entry */
 zend_module_entry pdo_pgsql_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050922
        STANDARD_MODULE_HEADER_EX, NULL,
        pdo_pgsql_deps,
-#else
-       STANDARD_MODULE_HEADER,
-#endif
        "pdo_pgsql",
        pdo_pgsql_functions,
        PHP_MINIT(pdo_pgsql),
@@ -70,7 +66,7 @@ zend_module_entry pdo_pgsql_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(pdo_pgsql),
-       "1.0.2",
+       PHP_PDO_PGSQL_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/pdo_pgsql/php_pdo_pgsql.h b/ext/pdo_pgsql/php_pdo_pgsql.h
index 643798e4ec423791c408b1d3d38c4b3294d90ef1..359c45213c68eb098c62af8660f4f6b7471c3264 100644 (file)
--- a/ext/pdo_pgsql/php_pdo_pgsql.h
+++ b/ext/pdo_pgsql/php_pdo_pgsql.h
@@ -26,6 +26,9 @@
 extern zend_module_entry pdo_pgsql_module_entry;
 #define phpext_pdo_pgsql_ptr &pdo_pgsql_module_entry
 
+#include "php_version.h"
+#define PHP_PDO_PGSQL_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif

diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c
index b9c2a657951f67977e6bc56d07d64a179999070c..689a71a0dbd6a9b9ae82a3cdb9cf17f97d6ce1c5 100644 (file)
--- a/ext/pdo_sqlite/pdo_sqlite.c
+++ b/ext/pdo_sqlite/pdo_sqlite.c
@@ -31,8 +31,6 @@
 #include "php_pdo_sqlite_int.h"
 #include "zend_exceptions.h"
 
-#define PHP_PDO_SQLITE_MODULE_VERSION  "1.0.1"
-
 /* {{{ pdo_sqlite_functions[] */
 const zend_function_entry pdo_sqlite_functions[] = {
        PHP_FE_END
@@ -52,12 +50,8 @@ static const zend_module_dep pdo_sqlite_deps[] = {
 /* {{{ pdo_sqlite_module_entry
  */
 zend_module_entry pdo_sqlite_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050922
        STANDARD_MODULE_HEADER_EX, NULL,
        pdo_sqlite_deps,
-#else
-       STANDARD_MODULE_HEADER,
-#endif
        "pdo_sqlite",
        pdo_sqlite_functions,
        PHP_MINIT(pdo_sqlite),
@@ -65,7 +59,7 @@ zend_module_entry pdo_sqlite_module_entry = {
        NULL,
        NULL,
        PHP_MINFO(pdo_sqlite),
-       PHP_PDO_SQLITE_MODULE_VERSION,
+       PHP_PDO_SQLITE_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 /* }}} */

diff --git a/ext/pdo_sqlite/php_pdo_sqlite.h b/ext/pdo_sqlite/php_pdo_sqlite.h
index 27e8a6a4636b2d9530a323f4b855808e8556c1f1..ea7c5a601f14f3a20ac5b4bea7989f9276a125ab 100644 (file)
--- a/ext/pdo_sqlite/php_pdo_sqlite.h
+++ b/ext/pdo_sqlite/php_pdo_sqlite.h
@@ -25,6 +25,9 @@
 extern zend_module_entry pdo_sqlite_module_entry;
 #define phpext_pdo_sqlite_ptr &pdo_sqlite_module_entry
 
+#include "php_version.h"
+#define PHP_PDO_SQLITE_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif