fmk Sat Aug 6 01:42:43 2005 EDT
Modified files:
/php-src/ext/sybase php_sybase_db.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/php_sybase_db.c?r1=1.65&r2=1.66&ty=u
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.65
php-src/ext/sybase/php_sybase_db.c:1.66
--- php-src/ext/sybase/php_sybase_db.c:1.65 Wed Aug 3 10:08:17 2005
+++ php-src/ext/sybase/php_sybase_db.c Sat Aug 6 01:42:42 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.c,v 1.65 2005/08/03 14:08:17 sniper Exp $ */
+/* $Id: php_sybase_db.c,v 1.66 2005/08/06 05:42:42 fmk Exp $ */
#ifdef HAVE_CONFIG_H
@@ -100,6 +100,8 @@
PHP_FE(sybase_affected_rows, NULL)
PHP_FE(sybase_min_error_severity, NULL)
PHP_FE(sybase_min_message_severity, 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)
@@ -119,6 +121,7 @@
PHP_FALIAS(mssql_affected_rows, sybase_affected_rows,
NULL)
PHP_FALIAS(mssql_min_error_severity, sybase_min_error_severity,
NULL)
PHP_FALIAS(mssql_min_message_severity, sybase_min_message_severity,
NULL)
+#endif
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
