From: Frank M. Kromann <fmk@php.net>
Date: Sat, 6 Aug 2005 05:42:51 +0000 (+0000)
Subject: Fix for #32531
X-Git-Tag: RELEASE_2_0_0~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7675a858286e9694a82f566cc4e05661d2bd3988;p=php

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.
---

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}
 };
 
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 817409bc2a..ce20b9d0d4 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -62,6 +62,7 @@ function_entry sybase_functions[] = {
 	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 @@ function_entry sybase_functions[] = {
 	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}
 };