summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/odbc/birdstep.c2
-rw-r--r--ext/odbc/php_birdstep.h3
-rw-r--r--ext/odbc/php_odbc.c2
-rw-r--r--ext/odbc/php_odbc.h3
-rw-r--r--ext/openssl/openssl.c2
-rw-r--r--ext/openssl/php_openssl.h3
-rw-r--r--ext/pcntl/pcntl.c2
-rw-r--r--ext/pcntl/php_pcntl.h3
-rw-r--r--ext/pcre/php_pcre.c2
-rw-r--r--ext/pcre/php_pcre.h3
-rw-r--r--ext/pdo/pdo.c6
-rw-r--r--ext/pdo/php_pdo.h3
-rw-r--r--ext/pdo_dblib/pdo_dblib.c2
-rw-r--r--ext/pdo_dblib/php_pdo_dblib.h3
-rw-r--r--ext/pdo_firebird/pdo_firebird.c2
-rw-r--r--ext/pdo_firebird/php_pdo_firebird.h3
-rw-r--r--ext/pdo_mysql/pdo_mysql.c2
-rw-r--r--ext/pdo_mysql/php_pdo_mysql.h3
-rw-r--r--ext/pdo_oci/pdo_oci.c6
-rw-r--r--ext/pdo_oci/php_pdo_oci.h3
-rw-r--r--ext/pdo_odbc/pdo_odbc.c6
-rw-r--r--ext/pdo_odbc/php_pdo_odbc.h3
-rw-r--r--ext/pdo_pgsql/pdo_pgsql.c6
-rw-r--r--ext/pdo_pgsql/php_pdo_pgsql.h3
-rw-r--r--ext/pdo_sqlite/pdo_sqlite.c8
-rw-r--r--ext/pdo_sqlite/php_pdo_sqlite.h3
26 files changed, 52 insertions, 35 deletions
diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c
index 54ae0e76e2..a1c8ffa7f8 100644
--- 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 abf0b716c3..9a8502cbf2 100644
--- 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 8d594c11e7..1f14ee23c7 100644
--- 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 8e43d298b0..857397b467 100644
--- 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 2b6ee3e6b4..704f119e1d 100644
--- 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 5edb0b88fc..804e5cf25a 100644
--- 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 8cb2617bc4..4842e1af44 100644
--- 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 b9af84b9ee..68f2983a24 100644
--- 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 06f6179884..117d288bb7 100644
--- 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 88f810493f..98882cce4e 100644
--- 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 00ed814696..61055e6193 100644
--- 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 71ec3693db..c9217dfffb 100644
--- 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 c22269f245..58ef3e270c 100644
--- 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 a8b1aa2b65..740ba21029 100644
--- 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 2d4d69d139..4b75e4b6bf 100644
--- 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 3939bb90c8..185ff14853 100644
--- 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 701137a2a5..6adf3b11c0 100644
--- 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 a70190b66a..78b16ef861 100644
--- 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 379107eb60..e6e9505c9d 100644
--- 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 a9cc8cb0b2..aae58ae1ec 100644
--- 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 924adb04a9..7f16434009 100644
--- 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 b7a23eada7..fb0be1b0b9 100644
--- 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 b5ee8d2551..abb0ee1c39 100644
--- 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 643798e4ec..359c45213c 100644
--- 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 b9c2a65795..689a71a0db 100644
--- 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 27e8a6a463..ea7c5a601f 100644
--- 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
View Lorry Controller Status