sniper Fri Nov 25 11:01:41 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo pdo.c
/php-src/ext/pdo_dblib pdo_dblib.c
/php-src/ext/pdo_mysql pdo_mysql.c
/php-src/ext/pdo_oci pdo_oci.c
/php-src/ext/pdo_pgsql pdo_pgsql.c
/php-src/ext/pdo_sqlite pdo_sqlite.c
/php-src/ext/sqlite sqlite.c
Log:
MFH: Fixed wrong usage of ZEND_EXTENSION_API_NO (these are not Zend exts :)
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.57.2.10&r2=1.57.2.11&ty=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.10 php-src/ext/pdo/pdo.c:1.57.2.11
--- php-src/ext/pdo/pdo.c:1.57.2.10 Wed Oct 5 18:17:38 2005
+++ php-src/ext/pdo/pdo.c Fri Nov 25 11:01:35 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo.c,v 1.57.2.10 2005/10/05 22:17:38 tony2001 Exp $ */
+/* $Id: pdo.c,v 1.57.2.11 2005/11/25 16:01:35 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -108,7 +108,7 @@
/* }}} */
/* {{{ pdo_functions[] */
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
static zend_module_dep pdo_deps[] = {
#ifdef HAVE_SPL
ZEND_MOD_REQUIRED("spl")
@@ -120,7 +120,7 @@
/* {{{ pdo_module_entry */
zend_module_entry pdo_module_entry = {
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_deps,
#else
http://cvs.php.net/diff.php/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.9.2.1&r2=1.9.2.2&ty=u
Index: php-src/ext/pdo_dblib/pdo_dblib.c
diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.1
php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.2
--- php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.1 Sun Sep 11 01:27:29 2005
+++ php-src/ext/pdo_dblib/pdo_dblib.c Fri Nov 25 11:01:39 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dblib.c,v 1.9.2.1 2005/09/11 05:27:29 wez Exp $ */
+/* $Id: pdo_dblib.c,v 1.9.2.2 2005/11/25 16:01:39 sniper Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -38,7 +38,7 @@
{NULL, NULL, NULL}
};
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
static zend_module_dep pdo_dblib_deps[] = {
ZEND_MOD_REQUIRED("pdo")
{NULL, NULL, NULL}
@@ -46,7 +46,7 @@
#endif
zend_module_entry pdo_dblib_module_entry = {
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_dblib_deps,
#else
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/pdo_mysql.c?r1=1.8.2.6&r2=1.8.2.7&ty=u
Index: php-src/ext/pdo_mysql/pdo_mysql.c
diff -u php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.6
php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.7
--- php-src/ext/pdo_mysql/pdo_mysql.c:1.8.2.6 Fri Oct 28 21:58:22 2005
+++ php-src/ext/pdo_mysql/pdo_mysql.c Fri Nov 25 11:01:39 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_mysql.c,v 1.8.2.6 2005/10/29 01:58:22 wez Exp $ */
+/* $Id: pdo_mysql.c,v 1.8.2.7 2005/11/25 16:01:39 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -37,7 +37,7 @@
/* }}} */
/* {{{ pdo_mysql_functions[] */
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
static zend_module_dep pdo_mysql_deps[] = {
ZEND_MOD_REQUIRED("pdo")
{NULL, NULL, NULL}
@@ -47,7 +47,7 @@
/* {{{ pdo_mysql_module_entry */
zend_module_entry pdo_mysql_module_entry = {
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_mysql_deps,
#else
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/pdo_oci.c?r1=1.5.2.1&r2=1.5.2.2&ty=u
Index: php-src/ext/pdo_oci/pdo_oci.c
diff -u php-src/ext/pdo_oci/pdo_oci.c:1.5.2.1
php-src/ext/pdo_oci/pdo_oci.c:1.5.2.2
--- php-src/ext/pdo_oci/pdo_oci.c:1.5.2.1 Sun Sep 11 01:27:30 2005
+++ php-src/ext/pdo_oci/pdo_oci.c Fri Nov 25 11:01:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_oci.c,v 1.5.2.1 2005/09/11 05:27:30 wez Exp $ */
+/* $Id: pdo_oci.c,v 1.5.2.2 2005/11/25 16:01:40 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -38,7 +38,7 @@
/* {{{ pdo_oci_module_entry */
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
static zend_module_dep pdo_oci_deps[] = {
ZEND_MOD_REQUIRED("pdo")
{NULL, NULL, NULL}
@@ -46,7 +46,7 @@
#endif
zend_module_entry pdo_oci_module_entry = {
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_oci_deps,
#else
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pdo_pgsql.c?r1=1.7.2.4&r2=1.7.2.5&ty=u
Index: php-src/ext/pdo_pgsql/pdo_pgsql.c
diff -u php-src/ext/pdo_pgsql/pdo_pgsql.c:1.7.2.4
php-src/ext/pdo_pgsql/pdo_pgsql.c:1.7.2.5
--- php-src/ext/pdo_pgsql/pdo_pgsql.c:1.7.2.4 Sat Oct 1 15:19:36 2005
+++ php-src/ext/pdo_pgsql/pdo_pgsql.c Fri Nov 25 11:01:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_pgsql.c,v 1.7.2.4 2005/10/01 19:19:36 wez Exp $ */
+/* $Id: pdo_pgsql.c,v 1.7.2.5 2005/11/25 16:01:40 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -38,7 +38,7 @@
/* {{{ pdo_sqlite_deps
*/
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
static zend_module_dep pdo_pgsql_deps[] = {
ZEND_MOD_REQUIRED("pdo")
{NULL, NULL, NULL}
@@ -48,7 +48,7 @@
/* {{{ pdo_pgsql_module_entry */
zend_module_entry pdo_pgsql_module_entry = {
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_pgsql_deps,
#else
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/pdo_sqlite.c?r1=1.10.2.1&r2=1.10.2.2&ty=u
Index: php-src/ext/pdo_sqlite/pdo_sqlite.c
diff -u php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.1
php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.2
--- php-src/ext/pdo_sqlite/pdo_sqlite.c:1.10.2.1 Sun Sep 11 01:27:30 2005
+++ php-src/ext/pdo_sqlite/pdo_sqlite.c Fri Nov 25 11:01:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sqlite.c,v 1.10.2.1 2005/09/11 05:27:30 wez Exp $ */
+/* $Id: pdo_sqlite.c,v 1.10.2.2 2005/11/25 16:01:40 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -41,7 +41,7 @@
/* {{{ pdo_sqlite_deps
*/
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
static zend_module_dep pdo_sqlite_deps[] = {
ZEND_MOD_REQUIRED("pdo")
{NULL, NULL, NULL}
@@ -52,7 +52,7 @@
/* {{{ pdo_sqlite_module_entry
*/
zend_module_entry pdo_sqlite_module_entry = {
-#if ZEND_EXTENSION_API_NO >= 220050617
+#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_sqlite_deps,
#else
@@ -100,7 +100,7 @@
"(bundled) "
#endif
PHP_PDO_SQLITE_MODULE_VERSION
- " $Id: pdo_sqlite.c,v 1.10.2.1 2005/09/11 05:27:30 wez Exp $");
+ " $Id: pdo_sqlite.c,v 1.10.2.2 2005/11/25 16:01:40 sniper Exp
$");
php_info_print_table_row(2, "SQLite Library", sqlite3_libversion());
php_info_print_table_end();
}
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.166.2.6&r2=1.166.2.7&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.6
php-src/ext/sqlite/sqlite.c:1.166.2.7
--- php-src/ext/sqlite/sqlite.c:1.166.2.6 Thu Nov 17 09:38:32 2005
+++ php-src/ext/sqlite/sqlite.c Fri Nov 25 11:01:41 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.166.2.6 2005/11/17 14:38:32 iliaa Exp $
+ $Id: sqlite.c,v 1.166.2.7 2005/11/25 16:01:41 sniper Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -282,7 +282,7 @@
};
zend_module_entry sqlite_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050608
+#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
sqlite_deps,
#elif ZEND_MODULE_API_NO >= 20010901
@@ -1125,7 +1125,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.6 2005/11/17 14:38:32 iliaa
Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.7 2005/11/25 16:01:41
sniper Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
