kalle Tue May 19 10:22:25 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_dblib config.w32 pdo_dblib.c php_pdo_dblib.h
Log:
MFH: Fix --with-pdo-mssql build and add some warnings if header/libs are not
found
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/config.w32?r1=1.7.4.1&r2=1.7.4.1.2.1&diff_format=u
Index: php-src/ext/pdo_dblib/config.w32
diff -u php-src/ext/pdo_dblib/config.w32:1.7.4.1
php-src/ext/pdo_dblib/config.w32:1.7.4.1.2.1
--- php-src/ext/pdo_dblib/config.w32:1.7.4.1 Thu May 11 21:43:58 2006
+++ php-src/ext/pdo_dblib/config.w32 Tue May 19 10:22:25 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.7.4.1 2006/05/11 21:43:58 edink Exp $
+// $Id: config.w32,v 1.7.4.1.2.1 2009/05/19 10:22:25 kalle Exp $
// vim:ft=javascript
ARG_WITH("pdo-dblib", "freetds dblib (Sybase, MS-SQL) support for PDO", "no");
@@ -13,8 +13,10 @@
{
EXTENSION("pdo_dblib", "pdo_dblib.c dblib_driver.c
dblib_stmt.c");
ADD_FLAG('CFLAGS_PDO_DBLIB', "/D
PDO_DBLIB_FLAVOUR=\\\"freetds\\\"");
+ ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
+ } else {
+ WARNING("pdo_dblib not enabled, libraries or headers not found")
}
- ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
}
ARG_WITH("pdo-mssql", "Native MS-SQL support for PDO", "no");
@@ -64,6 +66,8 @@
PDO_DBLIB_FLAVOUR = "MSSQL_" + PDO_DBLIB_FLAVOUR;
}
ADD_FLAG('CFLAGS_PDO_MSSQL', "/D PDO_DBLIB_FLAVOUR=\\\"" +
PDO_DBLIB_FLAVOUR + "\\\"");
+ ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
+ } else {
+ WARNING("pdo_mssql not enabled, libraries or headers not found")
}
- ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/pdo_dblib.c?r1=1.9.2.6.2.3.2.3&r2=1.9.2.6.2.3.2.4&diff_format=u
Index: php-src/ext/pdo_dblib/pdo_dblib.c
diff -u php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.3.2.3
php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.3.2.4
--- php-src/ext/pdo_dblib/pdo_dblib.c:1.9.2.6.2.3.2.3 Wed Dec 31 11:15:41 2008
+++ php-src/ext/pdo_dblib/pdo_dblib.c Tue May 19 10:22:25 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dblib.c,v 1.9.2.6.2.3.2.3 2008/12/31 11:15:41 sebastian Exp $ */
+/* $Id: pdo_dblib.c,v 1.9.2.6.2.3.2.4 2009/05/19 10:22:25 kalle Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -46,7 +46,11 @@
};
#endif
+#if PDO_DBLIB_IS_MSSQL
+zend_module_entry pdo_mssql_module_entry = {
+#else
zend_module_entry pdo_dblib_module_entry = {
+#endif
#if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL,
pdo_dblib_deps,
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/php_pdo_dblib.h?r1=1.2.2.1.2.1.2.3&r2=1.2.2.1.2.1.2.4&diff_format=u
Index: php-src/ext/pdo_dblib/php_pdo_dblib.h
diff -u php-src/ext/pdo_dblib/php_pdo_dblib.h:1.2.2.1.2.1.2.3
php-src/ext/pdo_dblib/php_pdo_dblib.h:1.2.2.1.2.1.2.4
--- php-src/ext/pdo_dblib/php_pdo_dblib.h:1.2.2.1.2.1.2.3 Wed Dec 31
11:15:41 2008
+++ php-src/ext/pdo_dblib/php_pdo_dblib.h Tue May 19 10:22:25 2009
@@ -17,14 +17,18 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_dblib.h,v 1.2.2.1.2.1.2.3 2008/12/31 11:15:41 sebastian Exp $
*/
+/* $Id: php_pdo_dblib.h,v 1.2.2.1.2.1.2.4 2009/05/19 10:22:25 kalle Exp $ */
#ifndef PHP_PDO_DBLIB_H
#define PHP_PDO_DBLIB_H
-
+#if PDO_DBLIB_IS_MSSQL
+extern zend_module_entry pdo_mssql_module_entry;
+#define phpext_pdo_mssql_ptr &pdo_mssql_module_entry
+#else
extern zend_module_entry pdo_dblib_module_entry;
#define phpext_pdo_dblib_ptr &pdo_dblib_module_entry
+#endif
#ifdef ZTS
# include "TSRM.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
