From 7675a858286e9694a82f566cc4e05661d2bd3988 Mon Sep 17 00:00:00 2001 From: "Frank M. Kromann" Date: Sat, 6 Aug 2005 05:42:51 +0000 Subject: 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. --- ext/sybase/php_sybase_db.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ext/sybase/php_sybase_db.c') diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c index 79d5ff1c77..ae46a57037 100644 --- a/ext/sybase/php_sybase_db.c +++ b/ext/sybase/php_sybase_db.c @@ -100,6 +100,8 @@ function_entry sybase_functions[] = { 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 @@ function_entry sybase_functions[] = { 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} }; -- cgit v1.2.1