fmk Sat Aug 6 01:42:52 2005 EDT
Modified files:
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
Fix for #32531
No need to alias these functions on windows or if the mssql extension is
compiled. This change will allow the use of both extensions at the same time.
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.102&r2=1.103&ty=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.102
php-src/ext/sybase_ct/php_sybase_ct.c:1.103
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.102 Wed Aug 3 10:08:17 2005
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sat Aug 6 01:42:51 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.102 2005/08/03 14:08:17 sniper Exp $ */
+/* $Id: php_sybase_ct.c,v 1.103 2005/08/06 05:42:51 fmk Exp $ */
#ifdef HAVE_CONFIG_H
@@ -62,6 +62,7 @@
PHP_FE(sybase_set_message_handler, NULL)
PHP_FE(sybase_deadlock_retry_count, NULL)
+#if !defined(PHP_WIN32) && !defined(HAVE_MSSQL)
PHP_FALIAS(mssql_connect, sybase_connect, NULL)
PHP_FALIAS(mssql_pconnect, sybase_pconnect, NULL)
PHP_FALIAS(mssql_close, sybase_close, NULL)
@@ -85,6 +86,7 @@
PHP_FALIAS(mssql_min_server_severity, sybase_min_server_severity, NULL)
PHP_FALIAS(mssql_set_message_handler, sybase_set_message_handler, NULL)
PHP_FALIAS(mssql_deadlock_retry_count, sybase_deadlock_retry_count,
NULL)
+#endif
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
